fix: stop sharing per-file scope state across goroutines

Signed-off-by: Joseph Kato <joseph@jdkato.io>

Author: jdkato

cmd/vale/main.go

@@ -56,7 +56,6 @@ func doLint(args []string, l *lint.Linter, glob string) ([]*core.File, error) {
 					fmt.Errorf("argument '%s' does not exist", file),
 				)
 			}
-			l.HasDir = status == 0
 			input = append(input, file)
 		}
 		linted, err = l.Lint(input, glob)

internal/core/file.go

@@ -50,6 +50,7 @@ type File struct {
 	lineIdxCtx string                     // the context lineIdx was built from
 	simple     bool                       // -
 	Lookup     bool                       // -
+	MetaScope  string                     // extra scope context, e.g. a YAML key or comment
 }
 
 // lineStarts returns the byte offset at which each line of ctx begins.
@@ -493,3 +494,14 @@ func (f *File) ResetComments() {
 		}
 	}
 }
+
+// SetMetaScope sets an optional scope appended to each check's scope, giving
+// it extra context. It lives on the file because files are linted
+// concurrently.
+func (f *File) SetMetaScope(scope string) {
+	if scope != "" {
+		f.MetaScope = "." + scope
+	} else {
+		f.MetaScope = ""
+	}
+}

internal/lint/ast.go

@@ -257,7 +257,7 @@ func (l *Linter) lintScope(f *core.File, state *walker, txt string) error {
 			txt = strings.TrimLeft(txt, " ")
 			shift -= len(txt)
 
-			b := state.block(txt, withClasses(scope, state)+l.metaScope+f.RealExt)
+			b := state.block(txt, withClasses(scope, state)+f.MetaScope+f.RealExt)
 
 			// Prose, not just a block: a list item or a heading is made of
 			// sentences the same way a paragraph is, and only this path segments
@@ -283,7 +283,7 @@ func (l *Linter) lintScope(f *core.File, state *walker, txt string) error {
 
 	f.Summary.WriteString(txt + "\n\n")
 
-	b := state.block(txt, withClasses("text", state)+l.metaScope+f.RealExt)
+	b := state.block(txt, withClasses("text", state)+f.MetaScope+f.RealExt)
 	if err := l.lintProse(f, b, state.lines); err != nil {
 		return err
 	}
@@ -318,7 +318,7 @@ func (l *Linter) lintInline(f *core.File, state *walker, blk nlp.Block, lines, s
 		}
 
 		b := nlp.NewLinedBlock(
-			blk.Context, cap.text, cap.scope+l.metaScope+f.RealExt, blk.Line)
+			blk.Context, cap.text, cap.scope+f.MetaScope+f.RealExt, blk.Line)
 		b.Offset = at
 
 		// Without an offset the match has to be located by searching, which is

internal/lint/code.go

@@ -51,7 +51,7 @@ func (l *Linter) lintCode(f *core.File) error {
 
 	last := 0
 	for _, comment := range comments {
-		l.SetMetaScope(comment.Scope)
+		f.SetMetaScope(comment.Scope)
 		if core.StringInSlice("comment", ignored) {
 			continue
 		} else if core.StringInSlice(comment.Scope, ignored) {

internal/lint/data.go

@@ -30,16 +30,12 @@ func (l *Linter) lintData(f *core.File) error {
 
 func (l *Linter) lintScopedValues(f *core.File, values []core.ScopedValues) error {
 	var err error
-	// We want to set up our processing servers as if we were dealing with
-	// a directory since we likely have many fragments to convert.
-	l.HasDir = true
-
 	wholeFile := f.Content
 	srcLines := strings.Split(wholeFile, "\n")
 	last := 0
 
 	for _, match := range values {
-		l.SetMetaScope(match.Scope)
+		f.SetMetaScope(match.Scope)
 
 		seen := make(map[string]int)
 		for _, sv := range match.Values {

internal/lint/fragment.go

@@ -76,10 +76,6 @@ func commentPadding(comment code.Comment, line int, source string, lang *code.La
 }
 
 func (l *Linter) lintFragments(f *core.File) error {
-	// We want to set up our processing servers as if we were dealing with
-	// a directory since we likely have many fragments to convert.
-	l.HasDir = true
-
 	lang, err := code.GetLanguageFromExt(f.RealExt)
 	if err != nil {
 		return err
@@ -99,7 +95,7 @@ func (l *Linter) lintFragments(f *core.File) error {
 
 	last := 0
 	for _, comment := range comments {
-		l.SetMetaScope(comment.Scope)
+		f.SetMetaScope(comment.Scope)
 		f.SetText(comment.Text)
 
 		switch f.NormedExt {

internal/lint/lint.go

@@ -23,9 +23,7 @@ type Linter struct {
 	Manager   *check.Manager
 	glob      *glob.Glob
 	client    *http.Client
-	HasDir    bool
 	nonGlobal bool
-	metaScope string
 
 	// adoc holds the Asciidoctor processes this run is using, and adocOnce
 	// starts them the first time an AsciiDoc file is seen.
@@ -104,18 +102,6 @@ func (l *Linter) LintString(src string) ([]*core.File, error) {
 	return []*core.File{linted.file}, linted.err
 }
 
-// SetMetaScope sets an optional meta scope.
-//
-// A meta scope is a string that is appended to the end of each check's scope
-// providing extra context for the check.
-func (l *Linter) SetMetaScope(scope string) {
-	if scope != "" {
-		l.metaScope = "." + scope
-	} else {
-		l.metaScope = ""
-	}
-}
-
 // Lint src according to its format.
 func (l *Linter) Lint(input []string, pat string) ([]*core.File, error) {
 	var linted []*core.File
@@ -306,12 +292,12 @@ func (l *Linter) lintProse(f *core.File, blk nlp.Block, lines int) error {
 }
 
 func (l *Linter) lintTxt(f *core.File) error {
-	block := nlp.NewBlock("", f.Content, "text"+l.metaScope+f.RealExt)
+	block := nlp.NewBlock("", f.Content, "text"+f.MetaScope+f.RealExt)
 	return l.lintProse(f, block, len(f.Lines))
 }
 
 func (l *Linter) lintLines(f *core.File) error {
-	block := nlp.NewBlock("", f.Content, "text"+l.metaScope+f.RealExt)
+	block := nlp.NewBlock("", f.Content, "text"+f.MetaScope+f.RealExt)
 	return l.lintBlock(f, block, len(f.Lines), 0, true)
 }