Merge pull request isaacphi#11 from virtuald/workspace-symbols

definition: match workspace symbols too

Author: virtuald

integrationtests/snapshots/clangd/definition/class.snap

@@ -2,6 +2,7 @@
 
 Symbol: TestClass
 /TEST_OUTPUT/workspace/clangd/src/consumer.cpp
+Kind: Class
 Range: L7:C1 - L15:C2
 
  7|class TestClass {

integrationtests/snapshots/clangd/definition/constant.snap

@@ -2,6 +2,7 @@
 
 Symbol: TEST_CONSTANT
 /TEST_OUTPUT/workspace/clangd/src/helper.cpp
+Kind: Variable
 Range: L4:C1 - L4:C29
 
 4|const int TEST_CONSTANT = 42;

integrationtests/snapshots/clangd/definition/foobar.snap

@@ -2,6 +2,7 @@
 
 Symbol: foo_bar
 /TEST_OUTPUT/workspace/src/main.cpp
+Kind: Function
 Range: L5:C1 - L8:C2
 
 5|void foo_bar() {

integrationtests/snapshots/clangd/definition/helperFunction.snap

@@ -2,6 +2,7 @@
 
 Symbol: helperFunction
 /TEST_OUTPUT/workspace/clangd/src/helper.cpp
+Kind: Function
 Range: L7:C1 - L7:C71
 
 7|void helperFunction() { std::cout << "Helper function" << std::endl; }

integrationtests/snapshots/clangd/definition/method.snap

@@ -2,6 +2,8 @@
 
 Symbol: method
 /TEST_OUTPUT/workspace/clangd/src/consumer.cpp
+Kind: Method
+Container Name: TestClass
 Range: L7:C1 - L15:C2
 
  7|class TestClass {

integrationtests/snapshots/clangd/definition/struct.snap

@@ -2,6 +2,7 @@
 
 Symbol: TestStruct
 /TEST_OUTPUT/workspace/clangd/src/types.cpp
+Kind: Class
 Range: L6:C1 - L8:C2
 
 6|struct TestStruct {

integrationtests/snapshots/clangd/definition/type.snap

@@ -2,6 +2,7 @@
 
 Symbol: TestType
 /TEST_OUTPUT/workspace/clangd/src/types.cpp
+Kind: Class
 Range: L10:C1 - L10:C21
 
 10|using TestType = int;

integrationtests/snapshots/clangd/definition/variable.snap

@@ -2,6 +2,7 @@
 
 Symbol: TEST_VARIABLE
 /TEST_OUTPUT/workspace/clangd/src/helper.cpp
+Kind: Variable
 Range: L5:C1 - L5:C24
 
 5|int TEST_VARIABLE = 100;  // A test variable used for integration testing purposes.

internal/tools/definition.go

@@ -21,33 +21,47 @@ func ReadDefinition(ctx context.Context, client *lsp.Client, symbolName string)
 		container := ""
 
 		// Skip symbols that we are not looking for. workspace/symbol may return
-		// a large number of fuzzy matches.
-		switch v := symbol.(type) {
-		case *protocol.SymbolInformation:
-			// SymbolInformation results have richer data.
-			kind = fmt.Sprintf("Kind: %s\n", protocol.TableKindMap[v.Kind])
-			if v.ContainerName != "" {
-				container = fmt.Sprintf("Container Name: %s\n", v.ContainerName)
+		// a large number of fuzzy matches. This handles BaseSymbolInformation
+		doesSymbolMatch := func(vKind protocol.SymbolKind, vContainerName string) bool {
+			thisName := symbol.GetName()
+
+			kind = fmt.Sprintf("Kind: %s\n", protocol.TableKindMap[vKind])
+			if vContainerName != "" {
+				container = fmt.Sprintf("Container Name: %s\n", vContainerName)
+			}
+
+			if thisName == symbolName {
+				return true
 			}
 
 			// Handle different matching strategies based on the search term
 			if strings.Contains(symbolName, ".") {
-				// For qualified names like "Type.Method", require exact match
-				if symbol.GetName() != symbolName {
-					continue
+				// For qualified names like "Type.Method", don't do fuzzy match
+
+			} else if vKind == protocol.Method {
+				// For methods, only match if the method name matches exactly Type.symbolName or Type::symbolName or symbolName
+				if strings.HasSuffix(thisName, "::"+symbolName) || strings.HasSuffix(symbolName, "::"+thisName) {
+					return true
 				}
-			} else {
-				// For unqualified names like "Method"
-				if v.Kind == protocol.Method {
-					// For methods, only match if the method name matches exactly Type.symbolName or Type::symbolName or symbolName
-					if !strings.HasSuffix(symbol.GetName(), "::"+symbolName) && !strings.HasSuffix(symbol.GetName(), "."+symbolName) && symbol.GetName() != symbolName {
-						continue
-					}
-				} else if symbol.GetName() != symbolName {
-					// For non-methods, exact match only
-					continue
+
+				if strings.HasSuffix(thisName, "."+symbolName) || strings.HasSuffix(symbolName, "."+thisName) {
+					return true
 				}
 			}
+
+			return false
+		}
+
+		switch v := symbol.(type) {
+		case *protocol.SymbolInformation:
+			if !doesSymbolMatch(v.Kind, v.ContainerName) {
+				continue
+			}
+
+		case *protocol.WorkspaceSymbol:
+			if !doesSymbolMatch(v.Kind, v.ContainerName) {
+				continue
+			}
 		default:
 			if symbol.GetName() != symbolName {
 				continue