LSP: Go to definition (#526)

* LSP: Go to definition Implement goto definition in the language service, for variables and standalone identifiers (much like with hover, there's still a lot of places that need to have identifier metadata emitted during typechecking). As those places are updated, they will work for hover as well as goto definition, which is a big upside! This also refactors the `Some(...)` AST transformation to use a bogus Position, so hover and goto definition work for `Some(...)` identifiers. * Fixing tests since Option.Some and Option.None transformations now use bogus position
kengorab · Dec 25, 2024 · 860fbfe · 860fbfe
1 parent 7565eaa
commit 860fbfe
Show file tree

Hide file tree

Showing 23 changed files with 155 additions and 77 deletions.
diff --git a/projects/compiler/src/parser.abra b/projects/compiler/src/parser.abra
@@ -1700,10 +1700,11 @@ export type Parser {
       _ => false
     }
     val invokee = if isSome {
+      val bogusPosition = Position(line: 0, col: 0)
       AstNode(
         token: token,
         kind: AstNodeKind.Accessor(AccessorAstNode(
-          root: AstNode(token: Token(position: token.position, kind: TokenKind.Ident("Option")), kind: AstNodeKind.Identifier(IdentifierKind.Named("Option"))),
+          root: AstNode(token: Token(position: bogusPosition, kind: TokenKind.Ident("Option")), kind: AstNodeKind.Identifier(IdentifierKind.Named("Option"))),
           path: [(Token(position: token.position, kind: TokenKind.Dot), Label(name: "Some", position: token.position))]
         ))
       )

diff --git a/projects/compiler/src/typechecker.abra b/projects/compiler/src/typechecker.abra
@@ -95,10 +95,16 @@ export enum IdentifierKindMeta {
   Type(isEnum: Bool, typeParams: String[])
 }
 
+export enum IdentifierMetaImport {
+  Prelude
+  Module(filePath: String)
+}
+
 export type IdentifierMeta {
   name: String
   kind: IdentifierKindMeta
-  importedFrom: String? = None
+  importedFrom: IdentifierMetaImport? = None
+  definitionPosition: Position? = None
 }
 
 export type TypedModule {
@@ -3058,6 +3064,7 @@ export type Typechecker {
           val ident = IdentifierMeta(
             name: label.name,
             kind: IdentifierKindMeta.Variable(mutable: mutable, typeRepr: ty.repr()),
+            definitionPosition: Some(label.position),
           )
 
           val v = (label.position.col - 1, label.position.col + label.name.length - 1, ident)
@@ -4023,10 +4030,11 @@ export type Typechecker {
       }
       IdentifierKind.Discard => return Err(TypeError(position: token.position, kind: TypeErrorKind.UnknownName("_", "variable")))
       IdentifierKind.None_ => {
+        val bogusPosition = Position(line: 0, col: 0)
         val replacement = AstNode(
           token: token,
           kind: AstNodeKind.Accessor(AccessorAstNode(
-            root: AstNode(token: Token(position: token.position, kind: TokenKind.Ident("Option")), kind: AstNodeKind.Identifier(IdentifierKind.Named("Option"))),
+            root: AstNode(token: Token(position: bogusPosition, kind: TokenKind.Ident("Option")), kind: AstNodeKind.Identifier(IdentifierKind.Named("Option"))),
             path: [(Token(position: token.position, kind: TokenKind.Dot), Label(name: "None", position: token.position))]
           ))
         )
@@ -4067,10 +4075,19 @@ export type Typechecker {
         VariableAlias.Enum(_enum) => IdentifierKindMeta.Type(isEnum: true, typeParams: _enum.typeParams)
       }
 
+      val importedFrom = if varImportMod |mod| {
+        Some(IdentifierMetaImport.Module(mod.name))
+      } else if variable.scope == self.project.preludeScope {
+        Some(IdentifierMetaImport.Prelude)
+      } else {
+        None
+      }
+
       val ident = IdentifierMeta(
         name: name,
         kind: kind,
-        importedFrom: varImportMod?.name,
+        importedFrom: importedFrom,
+        definitionPosition: Some(variable.label.position),
       )
 
       val v = (token.position.col - 1, token.position.col + name.length - 1, ident)

diff --git a/projects/compiler/test/parser/invocation_transform_OptionSome.out.json b/projects/compiler/test/parser/invocation_transform_OptionSome.out.json
@@ -37,7 +37,7 @@
                 "name": "accessor",
                 "root": {
                   "token": {
-                    "position": [1, 13],
+                    "position": [0, 0],
                     "kind": {
                       "name": "Ident",
                       "value": "Option"

diff --git a/projects/compiler/test/typechecker/array/array.out.json b/projects/compiler/test/typechecker/array/array.out.json
@@ -512,7 +512,7 @@
                   "kind": "accessor",
                   "head": {
                     "token": {
-                      "position": [7, 28],
+                      "position": [0, 0],
                       "kind": {
                         "name": "Ident",
                         "value": "Option"
@@ -666,7 +666,7 @@
                   "kind": "accessor",
                   "head": {
                     "token": {
-                      "position": [8, 19],
+                      "position": [0, 0],
                       "kind": {
                         "name": "Ident",
                         "value": "Option"
@@ -1069,7 +1069,7 @@
               "kind": "accessor",
               "head": {
                 "token": {
-                  "position": [11, 20],
+                  "position": [0, 0],
                   "kind": {
                     "name": "Ident",
                     "value": "Option"
@@ -1368,7 +1368,7 @@
               "kind": "accessor",
               "head": {
                 "token": {
-                  "position": [12, 30],
+                  "position": [0, 0],
                   "kind": {
                     "name": "Ident",
                     "value": "Option"
@@ -1605,7 +1605,7 @@
                         "kind": "accessor",
                         "head": {
                           "token": {
-                            "position": [14, 28],
+                            "position": [0, 0],
                             "kind": {
                               "name": "Ident",
                               "value": "Option"
@@ -2076,7 +2076,7 @@
               "kind": "accessor",
               "head": {
                 "token": {
-                  "position": [18, 13],
+                  "position": [0, 0],
                   "kind": {
                     "name": "Ident",
                     "value": "Option"

diff --git a/projects/compiler/test/typechecker/binary/eq.2.out.json b/projects/compiler/test/typechecker/binary/eq.2.out.json
@@ -136,7 +136,7 @@
             "kind": "accessor",
             "head": {
               "token": {
-                "position": [2, 6],
+                "position": [0, 0],
                 "kind": {
                   "name": "Ident",
                   "value": "Option"

diff --git a/projects/compiler/test/typechecker/binary/neq.2.out.json b/projects/compiler/test/typechecker/binary/neq.2.out.json
@@ -136,7 +136,7 @@
             "kind": "accessor",
             "head": {
               "token": {
-                "position": [2, 6],
+                "position": [0, 0],
                 "kind": {
                   "name": "Ident",
                   "value": "Option"

diff --git a/projects/compiler/test/typechecker/bindingdecl/bindingdecl.out.json b/projects/compiler/test/typechecker/bindingdecl/bindingdecl.out.json
@@ -240,7 +240,7 @@
             "kind": "accessor",
             "head": {
               "token": {
-                "position": [8, 16],
+                "position": [0, 0],
                 "kind": {
                   "name": "Ident",
                   "value": "Option"

diff --git a/projects/compiler/test/typechecker/funcdecl/funcdecl.5.out.json b/projects/compiler/test/typechecker/funcdecl/funcdecl.5.out.json
@@ -230,7 +230,7 @@
                       "kind": "accessor",
                       "head": {
                         "token": {
-                          "position": [3, 49],
+                          "position": [0, 0],
                           "kind": {
                             "name": "Ident",
                             "value": "Option"
@@ -372,7 +372,7 @@
                       "kind": "accessor",
                       "head": {
                         "token": {
-                          "position": [4, 31],
+                          "position": [0, 0],
                           "kind": {
                             "name": "Ident",
                             "value": "Option"
@@ -586,7 +586,7 @@
                       "kind": "accessor",
                       "head": {
                         "token": {
-                          "position": [5, 32],
+                          "position": [0, 0],
                           "kind": {
                             "name": "Ident",
                             "value": "Option"
@@ -812,7 +812,7 @@
                       "kind": "accessor",
                       "head": {
                         "token": {
-                          "position": [6, 32],
+                          "position": [0, 0],
                           "kind": {
                             "name": "Ident",
                             "value": "Option"
@@ -916,7 +916,7 @@
                                   "kind": "accessor",
                                   "head": {
                                     "token": {
-                                      "position": [6, 48],
+                                      "position": [0, 0],
                                       "kind": {
                                         "name": "Ident",
                                         "value": "Option"

diff --git a/projects/compiler/test/typechecker/identifier/identifier.out.json b/projects/compiler/test/typechecker/identifier/identifier.out.json
@@ -164,7 +164,7 @@
             "kind": "accessor",
             "head": {
               "token": {
-                "position": [4, 15],
+                "position": [0, 0],
                 "kind": {
                   "name": "Ident",
                   "value": "Option"

diff --git a/projects/compiler/test/typechecker/identifier/identifier_transform_OptionNone.out.json b/projects/compiler/test/typechecker/identifier/identifier_transform_OptionNone.out.json
@@ -56,7 +56,7 @@
             "kind": "accessor",
             "head": {
               "token": {
-                "position": [1, 15],
+                "position": [0, 0],
                 "kind": {
                   "name": "Ident",
                   "value": "Option"

diff --git a/projects/compiler/test/typechecker/if/expr.out.json b/projects/compiler/test/typechecker/if/expr.out.json
@@ -750,7 +750,7 @@
                   "kind": "accessor",
                   "head": {
                     "token": {
-                      "position": [21, 3],
+                      "position": [0, 0],
                       "kind": {
                         "name": "Ident",
                         "value": "Option"
@@ -1194,7 +1194,7 @@
                   "kind": "accessor",
                   "head": {
                     "token": {
-                      "position": [32, 3],
+                      "position": [0, 0],
                       "kind": {
                         "name": "Ident",
                         "value": "Option"
@@ -1427,7 +1427,7 @@
                   "kind": "accessor",
                   "head": {
                     "token": {
-                      "position": [36, 38],
+                      "position": [0, 0],
                       "kind": {
                         "name": "Ident",
                         "value": "Option"
@@ -1605,7 +1605,7 @@
                   "kind": "accessor",
                   "head": {
                     "token": {
-                      "position": [39, 19],
+                      "position": [0, 0],
                       "kind": {
                         "name": "Ident",
                         "value": "Option"
@@ -1954,7 +1954,7 @@
                   "kind": "accessor",
                   "head": {
                     "token": {
-                      "position": [45, 3],
+                      "position": [0, 0],
                       "kind": {
                         "name": "Ident",
                         "value": "Option"
@@ -2127,7 +2127,7 @@
                         "kind": "accessor",
                         "head": {
                           "token": {
-                            "position": [49, 16],
+                            "position": [0, 0],
                             "kind": {
                               "name": "Ident",
                               "value": "Option"

diff --git a/projects/compiler/test/typechecker/import/import_type_identifier.1.out.json b/projects/compiler/test/typechecker/import/import_type_identifier.1.out.json
@@ -615,7 +615,7 @@
               "kind": "accessor",
               "head": {
                 "token": {
-                  "position": [3, 15],
+                  "position": [0, 0],
                   "kind": {
                     "name": "Ident",
                     "value": "Option"
@@ -695,7 +695,7 @@
               "kind": "accessor",
               "head": {
                 "token": {
-                  "position": [4, 17],
+                  "position": [0, 0],
                   "kind": {
                     "name": "Ident",
                     "value": "Option"

diff --git a/projects/compiler/test/typechecker/import/import_type_identifier.2.out.json b/projects/compiler/test/typechecker/import/import_type_identifier.2.out.json
@@ -615,7 +615,7 @@
               "kind": "accessor",
               "head": {
                 "token": {
-                  "position": [3, 17],
+                  "position": [0, 0],
                   "kind": {
                     "name": "Ident",
                     "value": "Option"

diff --git a/projects/compiler/test/typechecker/invocation/invocation.5.out.json b/projects/compiler/test/typechecker/invocation/invocation.5.out.json
@@ -342,7 +342,7 @@
               "kind": "accessor",
               "head": {
                 "token": {
-                  "position": [4, 19],
+                  "position": [0, 0],
                   "kind": {
                     "name": "Ident",
                     "value": "Option"

diff --git a/projects/compiler/test/typechecker/invocation/invocation_instantiation_generics.2.out.json b/projects/compiler/test/typechecker/invocation/invocation_instantiation_generics.2.out.json
@@ -64,7 +64,7 @@
                   "kind": "accessor",
                   "head": {
                     "token": {
-                      "position": [3, 11],
+                      "position": [0, 0],
                       "kind": {
                         "name": "Ident",
                         "value": "Option"

diff --git a/projects/compiler/test/typechecker/lambda/lambda.1.out.json b/projects/compiler/test/typechecker/lambda/lambda.1.out.json
@@ -551,7 +551,7 @@
                           "kind": "accessor",
                           "head": {
                             "token": {
-                              "position": [3, 31],
+                              "position": [0, 0],
                               "kind": {
                                 "name": "Ident",
                                 "value": "Option"

diff --git a/projects/compiler/test/typechecker/map/map.out.json b/projects/compiler/test/typechecker/map/map.out.json
@@ -944,7 +944,7 @@
                     "kind": "accessor",
                     "head": {
                       "token": {
-                        "position": [9, 48],
+                        "position": [0, 0],
                         "kind": {
                           "name": "Ident",
                           "value": "Option"
@@ -1203,7 +1203,7 @@
                     "kind": "accessor",
                     "head": {
                       "token": {
-                        "position": [11, 36],
+                        "position": [0, 0],
                         "kind": {
                           "name": "Ident",
                           "value": "Option"
@@ -1252,7 +1252,7 @@
                     "kind": "accessor",
                     "head": {
                       "token": {
-                        "position": [11, 43],
+                        "position": [0, 0],
                         "kind": {
                           "name": "Ident",
                           "value": "Option"