Fix lint issues

Author: stefanvanburen

.golangci.yml

@@ -189,11 +189,6 @@ linters:
         # G115 checks for use of truncating conversions.
         path: private/buf/buflsp/semantic_tokens.go
         text: "G115:"
-      - linters:
-          - gosec
-        # G115 checks for use of truncating conversions.
-        path: private/buf/buflsp/semantic_tokens_cel.go
-        text: "G115:"
       - linters:
           - gosec
         # G115 checks for use of truncating conversions.

private/buf/buflsp/cel.go

@@ -193,6 +193,15 @@ func fileByteOffsetToCELOffset(fileByteOffset int, exprLiteralSpan source.Span)
 	return -1
 }
 
+// celLocByteOffset converts a CEL source location (line, col) to a byte offset
+// within exprString. line and col come from common.Location, which returns int,
+// but ComputeOffset requires int32; the conversion is safe for any realistic
+// CEL expression length.
+func celLocByteOffset(line, col int, sourceInfo *celast.SourceInfo, exprString string) int {
+	runeOffset := int32(col) + sourceInfo.ComputeOffset(int32(line), 0) //nolint:gosec // CEL expressions are never large enough to overflow int32
+	return celRuneOffsetToByteOffset(exprString, runeOffset)
+}
+
 // celRuneOffsetToByteOffset converts a CEL source position (Unicode code point offset)
 // to a UTF-8 byte offset within the expression string.
 //

private/buf/buflsp/hover_cel.go

@@ -191,7 +191,6 @@ func findMacroAtOffset(sourceInfo *ast.SourceInfo, offset int, exprString string
 		if startLoc.Line() <= 0 {
 			continue
 		}
-		celRuneOffset := int32(startLoc.Column()) + sourceInfo.ComputeOffset(int32(startLoc.Line()), 0)
 
 		// For method-style macros like this.all(...), find the method name after the dot
 		// For standalone macros like has(...), find the function name before the paren
@@ -203,13 +202,13 @@ func findMacroAtOffset(sourceInfo *ast.SourceInfo, offset int, exprString string
 			targetID := call.Target().ID()
 			targetLoc := sourceInfo.GetStartLocation(targetID)
 			if targetLoc.Line() > 0 {
-				targetByteOffset := celRuneOffsetToByteOffset(exprString, int32(targetLoc.Column())+sourceInfo.ComputeOffset(int32(targetLoc.Line()), 0))
+				targetByteOffset := celLocByteOffset(targetLoc.Line(), targetLoc.Column(), sourceInfo, exprString)
 				funcStart, funcEnd = findMethodNameAfterDot(targetByteOffset, funcName, exprString)
 				found = funcStart >= 0
 			}
 		} else {
 			// Standalone function call - CEL position points to opening paren, look backwards
-			celByteOffset := celRuneOffsetToByteOffset(exprString, celRuneOffset)
+			celByteOffset := celLocByteOffset(startLoc.Line(), startLoc.Column(), sourceInfo, exprString)
 			funcStart, funcEnd, found = findStandaloneFunctionName(celByteOffset, funcName, exprString)
 		}
 
@@ -249,7 +248,7 @@ func walkCELExprForHover(
 	if startLoc.Line() <= 0 {
 		return nil
 	}
-	celByteOffset := celRuneOffsetToByteOffset(exprString, int32(startLoc.Column())+sourceInfo.ComputeOffset(int32(startLoc.Line()), 0))
+	celByteOffset := celLocByteOffset(startLoc.Line(), startLoc.Column(), sourceInfo, exprString)
 
 	// Variable to hold the best match (deepest expression containing offset)
 	var bestMatch *celHoverInfo
@@ -306,7 +305,7 @@ func walkCELExprForHover(
 		if sel.Operand() != nil {
 			targetLoc := sourceInfo.GetStartLocation(sel.Operand().ID())
 			if targetLoc.Line() > 0 {
-				targetByteOffset := celRuneOffsetToByteOffset(exprString, int32(targetLoc.Column())+sourceInfo.ComputeOffset(int32(targetLoc.Line()), 0))
+				targetByteOffset := celLocByteOffset(targetLoc.Line(), targetLoc.Column(), sourceInfo, exprString)
 				fieldStart, fieldEnd := findMethodNameAfterDot(targetByteOffset, sel.FieldName(), exprString)
 				if fieldStart >= 0 && offset >= fieldStart && offset < fieldEnd {
 					// Cursor is on the field name
@@ -383,7 +382,7 @@ func walkCELExprForHover(
 				// Method call - search for the function name after the target
 				targetLoc := sourceInfo.GetStartLocation(call.Target().ID())
 				if targetLoc.Line() > 0 {
-					targetByteOffset := celRuneOffsetToByteOffset(exprString, int32(targetLoc.Column())+sourceInfo.ComputeOffset(int32(targetLoc.Line()), 0))
+					targetByteOffset := celLocByteOffset(targetLoc.Line(), targetLoc.Column(), sourceInfo, exprString)
 					funcStart, funcEnd = findMethodNameAfterDot(targetByteOffset, funcName, exprString)
 					found = funcStart >= 0
 				}

private/buf/buflsp/semantic_tokens_cel.go

@@ -221,24 +221,22 @@ func collectMacroTokens(
 		if startLoc.Line() <= 0 {
 			continue
 		}
-		celRuneOffset := int32(startLoc.Column()) + sourceInfo.ComputeOffset(int32(startLoc.Line()), 0)
-
 		// For method-style macros like this.all(...), we need to find the method name
 		// For standalone macros like has(...), we need to find the function name
 		if call.IsMemberFunction() {
 			// Method call - search for ".funcName" after the target
 			targetID := call.Target().ID()
 			targetLoc := sourceInfo.GetStartLocation(targetID)
 			if targetLoc.Line() > 0 {
-				targetByteOffset := celRuneOffsetToByteOffset(exprString, int32(targetLoc.Column())+sourceInfo.ComputeOffset(int32(targetLoc.Line()), 0))
+				targetByteOffset := celLocByteOffset(targetLoc.Line(), targetLoc.Column(), sourceInfo, exprString)
 				tokenSpan := findNameAfterDot(targetByteOffset, funcName, exprString, exprLiteralSpan)
 				if !tokenSpan.IsZero() {
 					collectToken(tokenSpan, semanticTypeMacro, 0, keyword.Unknown)
 				}
 			}
 		} else {
 			// Standalone function call - CEL position points to opening paren, look backwards
-			celByteOffset := celRuneOffsetToByteOffset(exprString, celRuneOffset)
+			celByteOffset := celLocByteOffset(startLoc.Line(), startLoc.Column(), sourceInfo, exprString)
 			funcStart := celByteOffset - len(funcName)
 			funcEnd := funcStart + len(funcName)
 			if funcStart >= 0 && funcEnd <= len(exprString) {
@@ -273,7 +271,7 @@ func walkCELExprWithVars(
 	if startLoc.Line() <= 0 {
 		return
 	}
-	celByteOffset := celRuneOffsetToByteOffset(exprString, int32(startLoc.Column())+sourceInfo.ComputeOffset(int32(startLoc.Line()), 0))
+	celByteOffset := celLocByteOffset(startLoc.Line(), startLoc.Column(), sourceInfo, exprString)
 
 	var tokenSpan source.Span
 
@@ -318,7 +316,7 @@ func walkCELExprWithVars(
 		if sel.Operand() != nil {
 			targetLoc := sourceInfo.GetStartLocation(sel.Operand().ID())
 			if targetLoc.Line() > 0 {
-				targetByteOffset := celRuneOffsetToByteOffset(exprString, int32(targetLoc.Column())+sourceInfo.ComputeOffset(int32(targetLoc.Line()), 0))
+				targetByteOffset := celLocByteOffset(targetLoc.Line(), targetLoc.Column(), sourceInfo, exprString)
 				tokenSpan = findNameAfterDot(targetByteOffset, sel.FieldName(), exprString, exprLiteralSpan)
 				if !tokenSpan.IsZero() {
 					collectToken(tokenSpan, semanticTypeProperty, 0, keyword.Unknown)
@@ -373,7 +371,7 @@ func walkCELExprWithVars(
 				// Method call - search for the function name after the target
 				targetLoc := sourceInfo.GetStartLocation(call.Target().ID())
 				if targetLoc.Line() > 0 {
-					targetByteOffset := celRuneOffsetToByteOffset(exprString, int32(targetLoc.Column())+sourceInfo.ComputeOffset(int32(targetLoc.Line()), 0))
+					targetByteOffset := celLocByteOffset(targetLoc.Line(), targetLoc.Column(), sourceInfo, exprString)
 					tokenSpan = findNameAfterDot(targetByteOffset, funcName, exprString, exprLiteralSpan)
 					if !tokenSpan.IsZero() {
 						collectToken(tokenSpan, tokenType, tokenModifier, keyword.Unknown)