update demo output

Signed-off-by: Pranav Gaikwad <[email protected]>

Author: pranavgaikwad

demo-local.Dockerfile

@@ -10,6 +10,7 @@ COPY provider_pod_local_settings.json /analyzer-lsp/provider_settings.json
 
 RUN python3 -m venv /analyzer-lsp/examples/python/.venv
 RUN yes | python3 -m pip install -r /analyzer-lsp/examples/python/requirements.txt
+RUN cd /analyzer-lsp/examples/nodejs && npm install
 
 EXPOSE 16686
 

demo-output.yaml

@@ -600,19 +600,19 @@
       - uri: file:///examples/nodejs/test_a.ts
         message: nodejs sample rule 001
         codeSnip: " 1  export interface Greeter {\n 2    name: string;\n 3    hello(): string;\n 4  }\n 5  \n 6  export const greeter: Greeter = {\n 7    name: \"Person1\",\n 8    hello() {\n 9      return `Hello, I'm ${this.name}`;\n10    },\n11  };\n"
-        lineNumber: 5
+        lineNumber: 6
         variables:
           file: file:///examples/nodejs/test_a.ts
       - uri: file:///examples/nodejs/test_b.ts
         message: nodejs sample rule 001
         codeSnip: " 1  import { greeter } from './test_a';\n 2  \n 3  console.log(greeter.hello());\n"
-        lineNumber: 0
+        lineNumber: 1
         variables:
           file: file:///examples/nodejs/test_b.ts
       - uri: file:///examples/nodejs/test_b.ts
         message: nodejs sample rule 001
         codeSnip: " 1  import { greeter } from './test_a';\n 2  \n 3  console.log(greeter.hello());\n"
-        lineNumber: 2
+        lineNumber: 3
         variables:
           file: file:///examples/nodejs/test_b.ts
       effort: 1
@@ -623,19 +623,30 @@
       - uri: file:///examples/nodejs/test_a.ts
         message: nodejs sample rule 002
         codeSnip: " 1  export interface Greeter {\n 2    name: string;\n 3    hello(): string;\n 4  }\n 5  \n 6  export const greeter: Greeter = {\n 7    name: \"Person1\",\n 8    hello() {\n 9      return `Hello, I'm ${this.name}`;\n10    },\n11  };\n"
-        lineNumber: 2
+        lineNumber: 3
         variables:
           file: file:///examples/nodejs/test_a.ts
       - uri: file:///examples/nodejs/test_a.ts
         message: nodejs sample rule 002
         codeSnip: " 1  export interface Greeter {\n 2    name: string;\n 3    hello(): string;\n 4  }\n 5  \n 6  export const greeter: Greeter = {\n 7    name: \"Person1\",\n 8    hello() {\n 9      return `Hello, I'm ${this.name}`;\n10    },\n11  };\n"
-        lineNumber: 7
+        lineNumber: 8
         variables:
           file: file:///examples/nodejs/test_a.ts
       - uri: file:///examples/nodejs/test_b.ts
         message: nodejs sample rule 002
         codeSnip: " 1  import { greeter } from './test_a';\n 2  \n 3  console.log(greeter.hello());\n"
-        lineNumber: 2
+        lineNumber: 3
+        variables:
+          file: file:///examples/nodejs/test_b.ts
+      effort: 1
+    node-sample-rule-003:
+      description: Testing that the node module files are not matched
+      category: potential
+      incidents:
+      - uri: file:///examples/nodejs/test_b.ts
+        message: nodejs sample rule 003
+        codeSnip: " 1  import { greeter } from './test_a';\n 2  \n 3  console.log(greeter.hello());\n"
+        lineNumber: 3
         variables:
           file: file:///examples/nodejs/test_b.ts
       effort: 1
@@ -785,9 +796,15 @@
       - uri: file:///examples/nodejs/Component.tsx
         message: Found React reference using nodejs provider
         codeSnip: " 1  import React from 'react';\n 2  \n 3  export const MyComponent: React.FC = () => {\n 4    return <div>Hello from TypeScript React</div>;\n 5  };\n"
-        lineNumber: 2
+        lineNumber: 1
         variables:
           file: file:///examples/nodejs/Component.tsx
+      - uri: file:///examples/nodejs/LegacyComponent.jsx
+        message: Found React reference using nodejs provider
+        codeSnip: " 1  import React from 'react';\n 2  \n 3  export const LegacyComponent = () => {\n 4    return <div>Hello from JavaScript React</div>;\n 5  };\n"
+        lineNumber: 1
+        variables:
+          file: file:///examples/nodejs/LegacyComponent.jsx
       effort: 1
     xml-pom-001:
       description: ""
@@ -1353,5 +1370,4 @@
   unmatched:
   - file-002
   - lang-ref-002
-  - node-sample-rule-003
   - python-sample-rule-003

examples/nodejs/package-lock.json

@@ -0,0 +1,7 @@
+{
+  "dependencies": {
+    "@types/node": "^24.10.1",
+    "@types/react": "^19.2.6",
+    "react": "^19.2.0"
+  }
+}

examples/nodejs/package.json

@@ -535,16 +535,15 @@ func (sc *LSPServiceClientBase) populateDocumentSymbolCache(ctx context.Context,
 					sc.Log.Error(err, "documentSymbol request failed", "uri", uri)
 					continue
 				}
-				for _, symbol := range findDocumentSymbolsAtLocation(uri, documentSymbols, definition) {
+				if symbol, ok := findDocumentSymbolAtLocation(uri, documentSymbols, definition); ok {
 					wsSymbolsForDefinitions[workspaceSymbolKey(symbol)] = symbol
 				}
 			}
 			definitionSymbols := []protocol.WorkspaceSymbol{}
 			for _, symbol := range wsSymbolsForDefinitions {
 				definitionSymbols = append(definitionSymbols, symbol)
 			}
-			// attach all definitions found with the original match, so that
-			// we can determine it as a referenced symbol
+			// attach all definitions found with the original match
 			pair := WorkspaceSymbolDefinitionsPair{
 				WorkspaceSymbol: protocol.WorkspaceSymbol{
 					Location: protocol.OrPLocation_workspace_symbol{
@@ -564,6 +563,7 @@ func (sc *LSPServiceClientBase) populateDocumentSymbolCache(ctx context.Context,
 			}
 			workspaceSymbols[workspaceSymbolKey(pair.WorkspaceSymbol)] = pair
 		}
+
 		workspaceSymbolsList := []WorkspaceSymbolDefinitionsPair{}
 		for _, pair := range workspaceSymbols {
 			workspaceSymbolsList = append(workspaceSymbolsList, pair)
@@ -725,19 +725,19 @@ func (sc *LSPServiceClientBase) searchContentForWorkspaceSymbols(ctx context.Con
 						},
 					},
 				}
-				matchingSymbols := findDocumentSymbolsAtLocation(fileURI, symbols, protoLoc)
-				positions = append(positions, matchingSymbols...)
-				positions = append(positions, protocol.WorkspaceSymbol{
-					Location: protocol.OrPLocation_workspace_symbol{
-						Value: protoLoc,
-					},
-					BaseSymbolInformation: protocol.BaseSymbolInformation{
-						Name:          scanner.Text()[loc[0]:loc[1]],
-						Kind:          0,
-						Tags:          []protocol.SymbolTag{},
-						ContainerName: "",
-					},
-				})
+				if symbol, ok := findDocumentSymbolAtLocation(fileURI, symbols, protoLoc); ok {
+					positions = append(positions, symbol)
+				} else {
+					positions = append(positions, protocol.WorkspaceSymbol{
+						Location: protocol.OrPLocation_workspace_symbol{
+							Value: protoLoc,
+						},
+						BaseSymbolInformation: protocol.BaseSymbolInformation{
+							Name: scanner.Text()[loc[0]:loc[1]],
+							Kind: 0,
+						},
+					})
+				}
 			}
 			lineNumber++
 		}
@@ -772,37 +772,44 @@ func (sc *LSPServiceClientBase) getDefinitionForPosition(ctx context.Context, ur
 	return res
 }
 
-func findDocumentSymbolsAtLocation(docURI uri.URI, symbols []protocol.DocumentSymbol, defLoc protocol.Location) []protocol.WorkspaceSymbol {
-	var out []protocol.WorkspaceSymbol
-	findSymbolsAtLocationRecursive(docURI, symbols, defLoc, "", &out)
-	return out
-}
-
-func findSymbolsAtLocationRecursive(docURI uri.URI, symbols []protocol.DocumentSymbol, defLoc protocol.Location, containerName string, out *[]protocol.WorkspaceSymbol) {
-	for _, symbol := range symbols {
-		symRange := preferredRange(symbol)
-		if rangeOverlaps(symRange, defLoc.Range) {
-			ws := protocol.WorkspaceSymbol{
-				BaseSymbolInformation: protocol.BaseSymbolInformation{
-					Name:          symbol.Name,
-					Kind:          symbol.Kind,
-					Tags:          symbol.Tags,
-					ContainerName: containerName,
-				},
-				Location: protocol.OrPLocation_workspace_symbol{
-					Value: protocol.Location{
-						URI:   protocol.DocumentURI(docURI),
-						Range: symRange,
-					},
-				},
+func findDocumentSymbolAtLocation(docURI uri.URI, symbols []protocol.DocumentSymbol, defLoc protocol.Location) (protocol.WorkspaceSymbol, bool) {
+	var bestSymbol protocol.WorkspaceSymbol
+	var bestLength uint64
+	found := false
+
+	var traverse func([]protocol.DocumentSymbol, string)
+	traverse = func(symbols []protocol.DocumentSymbol, containerName string) {
+		for _, symbol := range symbols {
+			symRange := preferredRange(symbol)
+			if rangeOverlaps(symRange, defLoc.Range) {
+				length := rangeLength(symRange)
+				if !found || length < bestLength {
+					bestSymbol = protocol.WorkspaceSymbol{
+						BaseSymbolInformation: protocol.BaseSymbolInformation{
+							Name:          symbol.Name,
+							Kind:          symbol.Kind,
+							Tags:          symbol.Tags,
+							ContainerName: containerName,
+						},
+						Location: protocol.OrPLocation_workspace_symbol{
+							Value: protocol.Location{
+								URI:   protocol.DocumentURI(docURI),
+								Range: symRange,
+							},
+						},
+					}
+					bestLength = length
+					found = true
+				}
+			}
+			if len(symbol.Children) > 0 {
+				traverse(symbol.Children, symbol.Name)
 			}
-			*out = append(*out, ws)
-		}
-		// Traverse children
-		if len(symbol.Children) > 0 {
-			findSymbolsAtLocationRecursive(docURI, symbol.Children, defLoc, symbol.Name, out)
 		}
 	}
+
+	traverse(symbols, "")
+	return bestSymbol, found
 }
 
 func rangeOverlaps(r1, r2 protocol.Range) bool {
@@ -825,3 +832,15 @@ func positionLessEqual(p1, p2 protocol.Position) bool {
 	}
 	return false
 }
+
+func rangeLength(r protocol.Range) uint64 {
+	lineDiff := int64(r.End.Line) - int64(r.Start.Line)
+	if lineDiff < 0 {
+		lineDiff = 0
+	}
+	charDiff := int64(r.End.Character) - int64(r.Start.Character)
+	if charDiff < 0 {
+		charDiff = 0
+	}
+	return (uint64(lineDiff) << 32) | uint64(charDiff)
+}