Find definitions through function applies

Started in #63 and #70
I think this now covers all (or most) cases
Most of this PR is just tests, since the missing code was just missing a few cases in switch cases

pkg/ast/processing/find_field.go

@@ -66,7 +66,7 @@ func FindRangesFromIndexList(stack *nodestack.NodeStack, indexList []string, vm
 		case *ast.Import:
 			filename := bodyNode.File.Value
 			foundDesugaredObjects = findTopLevelObjectsInFile(vm, filename, "")
-		case *ast.Index:
+		case *ast.Index, *ast.Apply:
 			tempStack := nodestack.NewNodeStack(bodyNode)
 			indexList = append(tempStack.BuildIndexList(), indexList...)
 			return FindRangesFromIndexList(stack, indexList, vm)

pkg/ast/processing/top_level_objects.go

@@ -55,6 +55,8 @@ func findTopLevelObjects(stack *nodestack.NodeStack, vm *jsonnet.VM) []*ast.Desu
 				continue
 			}
 			stack.Push(varReference)
+		case *ast.Function:
+			stack.Push(curr.Body)
 		}
 	}
 	return objects

pkg/nodestack/nodestack.go

@@ -56,9 +56,7 @@ func (s *NodeStack) BuildIndexList() []string {
 		curr := s.Pop()
 		switch curr := curr.(type) {
 		case *ast.Apply:
-			if target, ok := curr.Target.(*ast.Var); ok {
-				indexList = append(indexList, string(target.Id))
-			}
+			s.Push(curr.Target)
 		case *ast.SuperIndex:
 			s.Push(curr.Index)
 			indexList = append(indexList, "super")

pkg/server/definition_test.go

@@ -798,6 +798,102 @@ var definitionTestCases = []definitionTestCase{
 			},
 		}},
 	},
+	{
+		name:     "goto attribute of root-function library",
+		filename: "testdata/goto-root-function.jsonnet",
+		position: protocol.Position{Line: 5, Character: 70},
+		results: []definitionResult{{
+			targetFilename: "testdata/goto-root-function-lib.libsonnet",
+			targetRange: protocol.Range{
+				Start: protocol.Position{Line: 1, Character: 2},
+				End:   protocol.Position{Line: 1, Character: 22},
+			},
+			targetSelectionRange: protocol.Range{
+				Start: protocol.Position{Line: 1, Character: 2},
+				End:   protocol.Position{Line: 1, Character: 11},
+			},
+		}},
+	},
+	{
+		name:     "goto attribute of root-function library through local import",
+		filename: "testdata/goto-root-function.jsonnet",
+		position: protocol.Position{Line: 6, Character: 28},
+		results: []definitionResult{{
+			targetFilename: "testdata/goto-root-function-lib.libsonnet",
+			targetRange: protocol.Range{
+				Start: protocol.Position{Line: 1, Character: 2},
+				End:   protocol.Position{Line: 1, Character: 22},
+			},
+			targetSelectionRange: protocol.Range{
+				Start: protocol.Position{Line: 1, Character: 2},
+				End:   protocol.Position{Line: 1, Character: 11},
+			},
+		}},
+	},
+	{
+		name:     "goto attribute of root-function library through local resolved import",
+		filename: "testdata/goto-root-function.jsonnet",
+		position: protocol.Position{Line: 7, Character: 36},
+		results: []definitionResult{{
+			targetFilename: "testdata/goto-root-function-lib.libsonnet",
+			targetRange: protocol.Range{
+				Start: protocol.Position{Line: 1, Character: 2},
+				End:   protocol.Position{Line: 1, Character: 22},
+			},
+			targetSelectionRange: protocol.Range{
+				Start: protocol.Position{Line: 1, Character: 2},
+				End:   protocol.Position{Line: 1, Character: 11},
+			},
+		}},
+	},
+	{
+		name:     "goto nested attribute of root-function library",
+		filename: "testdata/goto-root-function.jsonnet",
+		position: protocol.Position{Line: 9, Character: 98},
+		results: []definitionResult{{
+			targetFilename: "testdata/goto-root-function-lib.libsonnet",
+			targetRange: protocol.Range{
+				Start: protocol.Position{Line: 4, Character: 4},
+				End:   protocol.Position{Line: 4, Character: 36},
+			},
+			targetSelectionRange: protocol.Range{
+				Start: protocol.Position{Line: 4, Character: 4},
+				End:   protocol.Position{Line: 4, Character: 19},
+			},
+		}},
+	},
+	{
+		name:     "goto nested attribute of root-function library through local import",
+		filename: "testdata/goto-root-function.jsonnet",
+		position: protocol.Position{Line: 10, Character: 55},
+		results: []definitionResult{{
+			targetFilename: "testdata/goto-root-function-lib.libsonnet",
+			targetRange: protocol.Range{
+				Start: protocol.Position{Line: 4, Character: 4},
+				End:   protocol.Position{Line: 4, Character: 36},
+			},
+			targetSelectionRange: protocol.Range{
+				Start: protocol.Position{Line: 4, Character: 4},
+				End:   protocol.Position{Line: 4, Character: 19},
+			},
+		}},
+	},
+	{
+		name:     "goto nested attribute of root-function library through local resolved import",
+		filename: "testdata/goto-root-function.jsonnet",
+		position: protocol.Position{Line: 11, Character: 64},
+		results: []definitionResult{{
+			targetFilename: "testdata/goto-root-function-lib.libsonnet",
+			targetRange: protocol.Range{
+				Start: protocol.Position{Line: 4, Character: 4},
+				End:   protocol.Position{Line: 4, Character: 36},
+			},
+			targetSelectionRange: protocol.Range{
+				Start: protocol.Position{Line: 4, Character: 4},
+				End:   protocol.Position{Line: 4, Character: 19},
+			},
+		}},
+	},
 }
 
 func TestDefinition(t *testing.T) {
@@ -891,13 +987,6 @@ func TestDefinitionFail(t *testing.T) {
 			position: protocol.Position{Line: 0, Character: 1},
 			expected: fmt.Errorf("cannot find definition"),
 		},
-
-		{
-			name:     "goto range index fails",
-			filename: "testdata/goto-local-function.libsonnet",
-			position: protocol.Position{Line: 15, Character: 57},
-			expected: fmt.Errorf("unexpected node type when finding bind for 'ports': *ast.Apply"),
-		},
 		{
 			name:     "goto super fails as no LHS object exists",
 			filename: "testdata/goto-local-function.libsonnet",

pkg/server/testdata/goto-root-function-lib.libsonnet

@@ -0,0 +1,7 @@
+function(attribute) {
+  attribute: attribute,
+
+  nestedFunc(nestedAttribute):: {
+    nestedAttribute: nestedAttribute,
+  },
+}

pkg/server/testdata/goto-root-function.jsonnet

@@ -0,0 +1,13 @@
+local lib = import 'goto-root-function-lib.libsonnet';
+local libResolved = (import 'goto-root-function-lib.libsonnet')('test');
+
+{
+
+  fromImport: (import 'goto-root-function-lib.libsonnet')('test').attribute,
+  fromLib: lib('test').attribute,
+  fromResolvedLib: libResolved.attribute,
+
+  nestedFromImport: (import 'goto-root-function-lib.libsonnet')('test').nestedFunc('test').nestedAttribute,
+  nestedFromLib: lib('test').nestedFunc('test').nestedAttribute,
+  nestedFromResolvedLib: libResolved.nestedFunc('test').nestedAttribute,
+}