Go to definition for variable

wkillerud · wkillerud · commit 5a89214fb9fc · 2024-11-17T13:16:53.000+01:00
diff --git a/pkgs/sass_language_server/lib/src/language_server.dart b/pkgs/sass_language_server/lib/src/language_server.dart
@@ -107,14 +107,15 @@ class LanguageServer {
           if (document == null) {
             var text = await fileSystemProvider.readFile(uri);
             document = TextDocument(
-                uri,
-                uri.path.endsWith('.sass')
-                    ? 'sass'
-                    : uri.path.endsWith('.css')
-                        ? 'css'
-                        : 'scss',
-                1,
-                text);
+              uri,
+              uri.path.endsWith('.sass')
+                  ? 'sass'
+                  : uri.path.endsWith('.css')
+                      ? 'css'
+                      : 'scss',
+              1,
+              text,
+            );
 
             _ls.parseStylesheet(document);
           }
diff --git a/pkgs/sass_language_services/lib/src/features/go_to_definition/go_to_definition_feature.dart b/pkgs/sass_language_services/lib/src/features/go_to_definition/go_to_definition_feature.dart
@@ -65,6 +65,7 @@ class GoToDefinitionFeature extends LanguageFeature {
             ? '$prefix$name'
             : name;
 
+        var stylesheet = ls.parseStylesheet(document);
         var symbols = ScopedSymbols(stylesheet,
             document.languageId == 'sass' ? Dialect.indented : Dialect.scss);
         var symbol = symbols.globalScope.getSymbol(
@@ -82,7 +83,7 @@ class GoToDefinitionFeature extends LanguageFeature {
       },
     );
 
-    if (definition != null) {
+    if (definition != null && definition.isNotEmpty) {
       return definition.first;
     }
 
diff --git a/pkgs/sass_language_services/lib/src/features/go_to_definition/scope_visitor.dart b/pkgs/sass_language_services/lib/src/features/go_to_definition/scope_visitor.dart
@@ -366,7 +366,7 @@ class ScopeVisitor with sass.RecursiveStatementVisitor {
   @override
   void visitVariableDeclaration(node) {
     _addSymbol(
-      name: node.nameSpan.text,
+      name: node.name,
       kind: ReferenceKind.variable,
       symbolRange: toRange(node.span),
       nameRange: lsp.Range(
diff --git a/pkgs/sass_language_services/lib/src/features/go_to_definition/scoped_symbols.dart b/pkgs/sass_language_services/lib/src/features/go_to_definition/scoped_symbols.dart
@@ -5,66 +5,75 @@ import 'scope.dart';
 import 'scope_visitor.dart';
 
 ReferenceKind? getNodeReferenceKind(sass.AstNode node) {
-  if (node.runtimeType is sass.VariableDeclaration) {
+  if (node is sass.VariableDeclaration) {
     return ReferenceKind.variable;
-  } else if (node.runtimeType is sass.Declaration) {
-    var name = (node as sass.Declaration).name;
+  } else if (node is sass.VariableExpression) {
+    return ReferenceKind.variable;
+  } else if (node is sass.Declaration) {
+    var name = node.name;
     var isCustomProperty = name.isPlain && name.asPlain!.startsWith("--");
 
     if (isCustomProperty) {
       return ReferenceKind.customProperty;
     }
-  } else if (node.runtimeType is sass.AtRule) {
-    var name = (node as sass.AtRule).name;
+  } else if (node is sass.AtRule) {
+    var name = node.name;
     var isKeyframe = name.isPlain && name.asPlain!.startsWith('keyframes');
     if (isKeyframe) {
       return ReferenceKind.keyframe;
     }
-  } else if (node.runtimeType is sass.ComplexSelectorComponent) {
+  } else if (node is sass.ComplexSelectorComponent) {
     return ReferenceKind.selector;
-  } else if (node.runtimeType is sass.SimpleSelector) {
+  } else if (node is sass.SimpleSelector) {
     return ReferenceKind.selector;
-  } else if (node.runtimeType is sass.PlaceholderSelector) {
+  } else if (node is sass.PlaceholderSelector) {
     return ReferenceKind.placeholderSelector;
-  } else if (node.runtimeType is sass.MixinRule) {
+  } else if (node is sass.MixinRule) {
     return ReferenceKind.mixin;
-  } else if (node.runtimeType is sass.FunctionExpression) {
+  } else if (node is sass.FunctionExpression) {
+    return ReferenceKind.function;
+  } else if (node is sass.FunctionRule) {
     return ReferenceKind.function;
   }
 
   return null;
 }
 
 String? getNodeName(sass.AstNode node) {
-  if (node.runtimeType is sass.VariableDeclaration) {
-    return (node as sass.VariableDeclaration).name;
-  } else if (node.runtimeType is sass.Declaration) {
-    var name = (node as sass.Declaration).name;
+  if (node is sass.VariableDeclaration) {
+    return node.name;
+  } else if (node is sass.VariableExpression) {
+    return node.name;
+  } else if (node is sass.Declaration) {
+    var name = node.name;
     var isCustomProperty = name.isPlain && name.asPlain!.startsWith("--");
     if (isCustomProperty) {
       return node.name.span.text;
     }
-  } else if (node.runtimeType is sass.AtRule) {
-    var name = (node as sass.AtRule).name;
+  } else if (node is sass.AtRule) {
+    var name = node.name;
     var isKeyframe = name.isPlain && name.asPlain!.startsWith('keyframes');
     if (isKeyframe) {
       var keyframesName = node.span.context.split(' ').elementAtOrNull(1);
       return keyframesName;
     }
-  } else if (node.runtimeType is sass.ComplexSelectorComponent) {
+  } else if (node is sass.ComplexSelectorComponent) {
     var rule = node as sass.ComplexSelectorComponent;
     return rule.span.text;
-  } else if (node.runtimeType is sass.SimpleSelector) {
-    var rule = node as sass.SimpleSelector;
+  } else if (node is sass.SimpleSelector) {
+    var rule = node;
     return rule.span.text;
-  } else if (node.runtimeType is sass.PlaceholderSelector) {
-    var placeholder = node as sass.PlaceholderSelector;
+  } else if (node is sass.PlaceholderSelector) {
+    var placeholder = node;
     return placeholder.name;
-  } else if (node.runtimeType is sass.MixinRule) {
-    var mixin = node as sass.MixinRule;
+  } else if (node is sass.MixinRule) {
+    var mixin = node;
     return mixin.name;
-  } else if (node.runtimeType is sass.FunctionExpression) {
-    var function = node as sass.FunctionExpression;
+  } else if (node is sass.FunctionExpression) {
+    var function = node;
+    return function.name;
+  } else if (node is sass.FunctionRule) {
+    var function = node;
     return function.name;
   }
 
diff --git a/pkgs/sass_language_services/lib/src/features/language_feature.dart b/pkgs/sass_language_services/lib/src/features/language_feature.dart
@@ -24,11 +24,17 @@ abstract class LanguageFeature {
       bool lazy = false,
       int depth = 0}) async {
     return _findInWorkspace(
-        callback: callback,
-        initialDocument: initialDocument,
-        currentDocument: initialDocument,
-        depth: depth,
-        lazy: lazy);
+      callback: callback,
+      initialDocument: initialDocument,
+      currentDocument: initialDocument,
+      depth: depth,
+      lazy: lazy,
+      hiddenMixinsAndFunctions: [],
+      hiddenVariables: [],
+      shownMixinsAndFunctions: [],
+      shownVariables: [],
+      visited: {},
+    );
   }
 
   Future<List<T>?> _findInWorkspace<T>(
@@ -42,12 +48,12 @@ abstract class LanguageFeature {
       }) callback,
       required TextDocument initialDocument,
       required TextDocument currentDocument,
+      required List<String> hiddenMixinsAndFunctions,
+      required List<String> hiddenVariables,
+      required List<String> shownMixinsAndFunctions,
+      required List<String> shownVariables,
+      required Set<String> visited,
       String accumulatedPrefix = '',
-      List<String> hiddenMixinsAndFunctions = const [],
-      List<String> hiddenVariables = const [],
-      List<String> shownMixinsAndFunctions = const [],
-      List<String> shownVariables = const [],
-      Set<String> visited = const {},
       bool lazy = false,
       int depth = 0}) async {
     if (visited.contains(currentDocument.uri.toString())) {
@@ -95,11 +101,24 @@ abstract class LanguageFeature {
         continue;
       }
 
-      var next = ls.cache.getDocument(link.target!);
+      var uri = link.target!;
+      var next = ls.cache.getDocument(uri);
       if (next == null) {
-        // We shouldn't really end up here. If so, the feature's handler in
-        // the server should await the initial scan.
-        continue;
+        // We shouldn't really end up here outside of unit tests.
+        // The language server's initial scan should have put all
+        // linked documents in the cache already.
+        var text = await ls.fs.readFile(uri);
+        next = TextDocument(
+          uri,
+          uri.path.endsWith('.sass')
+              ? 'sass'
+              : uri.path.endsWith('.css')
+                  ? 'css'
+                  : 'scss',
+          1,
+          text,
+        );
+        ls.parseStylesheet(next);
       }
 
       var prefix = accumulatedPrefix;
@@ -126,7 +145,7 @@ abstract class LanguageFeature {
       var linkResult = await _findInWorkspace(
         callback: callback,
         initialDocument: initialDocument,
-        currentDocument: currentDocument,
+        currentDocument: next,
         accumulatedPrefix: prefix,
         hiddenMixinsAndFunctions: hiddenMixinsAndFunctions,
         hiddenVariables: hiddenVariables,
