chore: linting

Author: ldez

.github/workflows/ci.yml

@@ -15,7 +15,7 @@ jobs:
     runs-on: ubuntu-latest
     env:
       GO_VERSION: stable
-      GOLANGCI_LINT_VERSION: v2.0
+      GOLANGCI_LINT_VERSION: v2.1
       CGO_ENABLED: 0
 
     steps:

replace.go

@@ -78,59 +78,6 @@ func (r *Replacer) Compile() {
 	r.engine = NewStringReplacer(r.Replacements...)
 }
 
-/*
-line1 and line2 are different
-extract words from each line1
-
-replace word -> newword
-if word == new-word
-
-	continue
-
-if new-word in list of replacements
-
-	continue
-
-new word not original, and not in list of replacements some substring got mixed up.  UNdo.
-*/
-func (r *Replacer) recheckLine(s string, lineNum int, buf io.Writer, next func(Diff)) {
-	first := 0
-	redacted := RemoveNotWords(s)
-
-	idx := wordRegexp.FindAllStringIndex(redacted, -1)
-	for _, ab := range idx {
-		word := s[ab[0]:ab[1]]
-		newword := r.engine.Replace(word)
-		if newword == word {
-			// no replacement done
-			continue
-		}
-
-		// ignore camelCase words
-		// https://github.com/client9/misspell/issues/113
-		if CaseStyle(word) == CaseUnknown {
-			continue
-		}
-
-		if StringEqualFold(r.corrected[strings.ToLower(word)], newword) {
-			// word got corrected into something we know
-			io.WriteString(buf, s[first:ab[0]])
-			io.WriteString(buf, newword)
-			first = ab[1]
-			next(Diff{
-				FullLine:  s,
-				Line:      lineNum,
-				Original:  word,
-				Corrected: newword,
-				Column:    ab[0],
-			})
-			continue
-		}
-		// Word got corrected into something unknown. Ignore it
-	}
-	io.WriteString(buf, s[first:])
-}
-
 // ReplaceGo is a specialized routine for correcting Golang source files.
 // Currently only checks comments, not identifiers for spelling.
 func (r *Replacer) ReplaceGo(input string) (string, []Diff) {
@@ -236,3 +183,56 @@ func (r *Replacer) ReplaceReader(raw io.Reader, w io.Writer, next func(Diff)) er
 	}
 	return nil
 }
+
+/*
+line1 and line2 are different
+extract words from each line1
+
+replace word -> newword
+if word == new-word
+
+	continue
+
+if new-word in list of replacements
+
+	continue
+
+new word not original, and not in list of replacements some substring got mixed up.  UNdo.
+*/
+func (r *Replacer) recheckLine(s string, lineNum int, buf io.Writer, next func(Diff)) {
+	first := 0
+	redacted := RemoveNotWords(s)
+
+	idx := wordRegexp.FindAllStringIndex(redacted, -1)
+	for _, ab := range idx {
+		word := s[ab[0]:ab[1]]
+		newword := r.engine.Replace(word)
+		if newword == word {
+			// no replacement done
+			continue
+		}
+
+		// ignore camelCase words
+		// https://github.com/client9/misspell/issues/113
+		if CaseStyle(word) == CaseUnknown {
+			continue
+		}
+
+		if StringEqualFold(r.corrected[strings.ToLower(word)], newword) {
+			// word got corrected into something we know
+			io.WriteString(buf, s[first:ab[0]])
+			io.WriteString(buf, newword)
+			first = ab[1]
+			next(Diff{
+				FullLine:  s,
+				Line:      lineNum,
+				Original:  word,
+				Corrected: newword,
+				Column:    ab[0],
+			})
+			continue
+		}
+		// Word got corrected into something unknown. Ignore it
+	}
+	io.WriteString(buf, s[first:])
+}

stringreplacer.go

@@ -204,42 +204,6 @@ func makeGenericReplacer(oldnew []string) *genericReplacer {
 	return r
 }
 
-func (r *genericReplacer) lookup(s string, ignoreRoot bool) (val string, keylen int, found bool) {
-	// Iterate down the trie to the end, and grab the value and keylen with
-	// the highest priority.
-	bestPriority := 0
-	node := &r.root
-	n := 0
-	for node != nil {
-		if node.priority > bestPriority && (!ignoreRoot || node != &r.root) {
-			bestPriority = node.priority
-			val = node.value
-			keylen = n
-			found = true
-		}
-
-		if s == "" {
-			break
-		}
-		if node.table != nil {
-			index := r.mapping[ByteToLower(s[0])]
-			if int(index) == r.tableSize {
-				break
-			}
-			node = node.table[index]
-			s = s[1:]
-			n++
-		} else if node.prefix != "" && StringHasPrefixFold(s, node.prefix) {
-			n += len(node.prefix)
-			s = s[len(node.prefix):]
-			node = node.next
-		} else {
-			break
-		}
-	}
-	return
-}
-
 func (r *genericReplacer) Replace(s string) string {
 	buf := make(appendSliceWriter, 0, len(s))
 	r.WriteString(&buf, s)
@@ -305,6 +269,42 @@ func (r *genericReplacer) WriteString(w io.Writer, s string) (n int, err error)
 	return
 }
 
+func (r *genericReplacer) lookup(s string, ignoreRoot bool) (val string, keylen int, found bool) {
+	// Iterate down the trie to the end, and grab the value and keylen with
+	// the highest priority.
+	bestPriority := 0
+	node := &r.root
+	n := 0
+	for node != nil {
+		if node.priority > bestPriority && (!ignoreRoot || node != &r.root) {
+			bestPriority = node.priority
+			val = node.value
+			keylen = n
+			found = true
+		}
+
+		if s == "" {
+			break
+		}
+		if node.table != nil {
+			index := r.mapping[ByteToLower(s[0])]
+			if int(index) == r.tableSize {
+				break
+			}
+			node = node.table[index]
+			s = s[1:]
+			n++
+		} else if node.prefix != "" && StringHasPrefixFold(s, node.prefix) {
+			n += len(node.prefix)
+			s = s[len(node.prefix):]
+			node = node.next
+		} else {
+			break
+		}
+	}
+	return
+}
+
 type appendSliceWriter []byte
 
 // Write writes to the buffer to satisfy io.Writer.