Add tests for clobbered fields (#27)

Just testing for things that already work in advance of doing the work for #6

Author: julienduchesne

pkg/server/definition_test.go

@@ -369,6 +369,45 @@ func TestDefinition(t *testing.T) {
 				End:   protocol.Position{Line: 7, Character: 9},
 			},
 		},
+		{
+			name:     "goto with overrides: clobber string",
+			filename: "testdata/goto-overrides.jsonnet",
+			position: protocol.Position{Line: 38, Character: 30},
+			targetRange: protocol.Range{
+				Start: protocol.Position{Line: 24, Character: 4},
+				End:   protocol.Position{Line: 24, Character: 23},
+			},
+			targetSelectionRange: protocol.Range{
+				Start: protocol.Position{Line: 24, Character: 4},
+				End:   protocol.Position{Line: 24, Character: 10},
+			},
+		},
+		{
+			name:     "goto with overrides: clobber nested string",
+			filename: "testdata/goto-overrides.jsonnet",
+			position: protocol.Position{Line: 39, Character: 44},
+			targetRange: protocol.Range{
+				Start: protocol.Position{Line: 26, Character: 6},
+				End:   protocol.Position{Line: 26, Character: 24},
+			},
+			targetSelectionRange: protocol.Range{
+				Start: protocol.Position{Line: 26, Character: 6},
+				End:   protocol.Position{Line: 26, Character: 11},
+			},
+		},
+		{
+			name:     "goto with overrides: clobber map",
+			filename: "testdata/goto-overrides.jsonnet",
+			position: protocol.Position{Line: 40, Character: 28},
+			targetRange: protocol.Range{
+				Start: protocol.Position{Line: 28, Character: 4},
+				End:   protocol.Position{Line: 28, Character: 15},
+			},
+			targetSelectionRange: protocol.Range{
+				Start: protocol.Position{Line: 28, Character: 4},
+				End:   protocol.Position{Line: 28, Character: 11},
+			},
+		},
 	}
 	for _, tc := range testCases {
 		t.Run(tc.name, func(t *testing.T) {

pkg/server/testdata/goto-overrides.jsonnet

@@ -0,0 +1,42 @@
+{
+  // 1. Initial definition
+  a: {
+    hello: 'world',
+    nested1: {
+      hello: 'world',
+    },
+    nested2: {
+      hello: 'world',
+    },
+  },
+}
++ {
+  // 2. Override maps but keep string keys
+  a+: {
+    hello2: 'world2',
+    nested1+: {
+      hello2: 'world2',
+    },
+  },
+}
++ {
+  // 3. Clobber some attributes
+  a+: {
+    hello2: 'clobbered',  // Clobber a string
+    nested1+: {
+      hello: 'clobbered',  // Clobber a nested attribute
+    },
+    nested2: {},  // Clobber the whole map
+  },
+}
++ {
+  map_overrides: self.a,  // This should refer to all three definitions (initial + 2 overrides)
+  nested_map_overrides: self.a.nested1,  // This should refer to all three definitions (initial + 2 overrides)
+
+  carried_string: self.a.hello,  // This should refer to the initial definition (map 1)
+  carried_nested_string: self.a.nested1.hello2,  // This should refer to the initial definition (map 2)
+
+  clobbered_string: self.a.hello2,  // This should refer to the override only (map 3)
+  clobbered_nested_string: self.a.nested1.hello,  // This should refer to the override only (map 3)
+  clobbered_map: self.a.nested2,  // This should refer to the override only (map 3)
+}