Apply feedback

Author: jpbetz

v2/codetags/extractor.go

@@ -36,18 +36,18 @@ import (
 // Example: When called with prefix "+k8s:", lines:
 //
 //	Comment line without marker
-//	+k8s:noArgs // comment
+//	+k8s:noArgs # comment
 //	+withValue=value1
 //	+withValue=value2
 //	+k8s:withArg(arg1)=value1
-//	+k8s:withArg(arg2)=value2 // comment
+//	+k8s:withArg(arg2)=value2 # comment
 //	+k8s:withNamedArgs(arg1=value1, arg2=value2)=value
 //
 // Then this function will return:
 //
 //	map[string][]string{
-//		"noArgs":        {"noArgs // comment"},
-//		"withArg":       {"withArg(arg1)=value1", "withArg(arg2)=value2 // comment"},
+//		"noArgs":        {"noArgs # comment"},
+//		"withArg":       {"withArg(arg1)=value1", "withArg(arg2)=value2 # comment"},
 //		"withNamedArgs": {"withNamedArgs(arg1=value1, arg2=value2)=value"},
 //	}
 func Extract(prefix string, lines []string) map[string][]string {

v2/codetags/parser.go

@@ -71,7 +71,7 @@ import (
 //
 // For example,
 //
-//	"name" // no value
+//	"name" # no value
 //	"name=identifier"
 //	"name="double-quoted value""
 //	"name=`backtick-quoted value`"
@@ -85,7 +85,7 @@ import (
 //
 // For example,
 //
-//	"key=value // This comment is ignored"
+//	"key=value # This comment is ignored"
 //
 // Formal Grammar:
 //
@@ -217,7 +217,7 @@ func parseTag(input string, opts parseOpts) (Tag, error) {
 parseLoop:
 	for r := s.peek(); r != EOF; r = s.peek() {
 		switch st {
-		case stTag:
+		case stTag: // Any leading whitespace is expected to be trimmed before parsing.
 			switch {
 			case isIdentBegin(r):
 				tagName, err = s.nextIdent(isTagNameInterior)

v2/codetags/scanner.go

@@ -67,20 +67,10 @@ const (
 )
 
 func (s *scanner) nextIsTrailingComment() bool {
-	if s.pos >= len(s.buf)-1 {
-		return false
+	i := 0
+	for ; unicode.IsSpace(s.peekN(i)); i++ {
 	}
-	for i := s.pos; i < len(s.buf)-1; i++ {
-		switch {
-		case unicode.IsSpace(s.buf[i]):
-			continue
-		case s.buf[i] == '#':
-			return true
-		default:
-			return false
-		}
-	}
-	return false
+	return s.peekN(i) == '#'
 }
 
 func (s *scanner) nextNumber() (string, error) {