Test for custom properties

Change scopes to be inclusive of length, for the indented dialect.
Symbols at the end of the range might get dropped from the scope
otherwise.

Author: wkillerud

pkgs/sass_language_services/lib/src/features/go_to_definition/scope.dart

@@ -8,6 +8,7 @@ class Scope {
 
   final _symbols = <StylesheetDocumentSymbol>[];
 
+  /// Starting at [offset] and going for [lenght] characters, inclusive.
   Scope({required this.offset, required this.length});
 
   void addChild(Scope scope) {
@@ -32,7 +33,7 @@ class Scope {
     var scopeAtOffset = children.firstWhere(
         (scope) =>
             scope.offset <= offset &&
-            scope.offset + scope.length > offset + length,
+            scope.offset + scope.length >= offset + length,
         orElse: () => this);
 
     if (scopeAtOffset == this) {

pkgs/sass_language_services/lib/src/features/go_to_definition/scope_visitor.dart

@@ -65,14 +65,20 @@ class ScopeVisitor with sass.RecursiveStatementVisitor {
     var isCustomProperty =
         node.name.isPlain && node.name.asPlain!.startsWith("--");
     if (isCustomProperty) {
-      _addSymbol(
+      // Add all custom properties to the global scope.
+
+      var range = toRange(node.span);
+      var selectionRange = toRange(node.name.span);
+
+      var symbol = StylesheetDocumentSymbol(
         name: node.name.span.text,
-        kind: ReferenceKind.variable,
-        symbolRange: toRange(node.span),
-        nameRange: toRange(node.name.span),
-        offset: node.span.start.offset,
-        length: node.span.length,
+        referenceKind: ReferenceKind.customProperty,
+        range: range,
+        children: [],
+        selectionRange: selectionRange,
       );
+
+      scope.addSymbol(symbol);
     }
 
     super.visitDeclaration(node);

pkgs/sass_language_services/lib/src/features/go_to_definition/scoped_symbols.dart

@@ -9,10 +9,9 @@ ReferenceKind? getNodeReferenceKind(sass.AstNode node) {
     return ReferenceKind.variable;
   } 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("--");
-
+  } else if (node is sass.StringExpression) {
+    var isCustomProperty =
+        node.text.isPlain && node.text.asPlain!.startsWith("--");
     if (isCustomProperty) {
       return ReferenceKind.customProperty;
     }
@@ -46,11 +45,11 @@ String? getNodeName(sass.AstNode node) {
     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("--");
+  } else if (node is sass.StringExpression) {
+    var isCustomProperty =
+        node.text.isPlain && node.text.asPlain!.startsWith("--");
     if (isCustomProperty) {
-      return node.name.span.text;
+      return node.text.asPlain;
     }
   } else if (node is sass.AtRule) {
     var name = node.name;

pkgs/sass_language_services/test/features/go_to_definition/go_to_definition_test.dart

@@ -264,10 +264,30 @@ nav ul {
     });
   });
 
-  group('css variables', () {
+  group('css', () {
     setUp(() {
       ls.cache.clear();
     });
+
+    test('custom properties', () async {
+      var document = fs.createDocument(r'''
+:root
+  --color-text: #000
+
+.a
+  color: var(--color-text)
+''', uri: 'styles.sass');
+
+      var result = await ls.goToDefinition(document, at(line: 4, char: 16));
+
+      expect(result, isNotNull);
+      expect(result!.range, StartsAtLine(1));
+      expect(result.range, EndsAtLine(1));
+      expect(result.range, StartsAtCharacter(2));
+      expect(result.range, EndsAtCharacter(14));
+
+      expect(result.uri.toString(), endsWith('styles.sass'));
+    });
   });
 
   group('@extended CSS class', () {

pkgs/sass_language_services/test/features/go_to_definition/scope_test.dart

@@ -39,12 +39,12 @@ void main() {
       expect(global.findScope(offset: -1), isNull);
 
       expect(global.findScope(offset: 0), equals(global));
-      expect(global.findScope(offset: 20), equals(global));
+      expect(global.findScope(offset: 21), equals(global));
 
       expect(global.findScope(offset: 10), equals(first));
-      expect(global.findScope(offset: 14), equals(first));
-      expect(global.findScope(offset: 15), equals(second));
-      expect(global.findScope(offset: 19), equals(second));
+      expect(global.findScope(offset: 15), equals(first));
+      expect(global.findScope(offset: 16), equals(second));
+      expect(global.findScope(offset: 20), equals(second));
     });
   });
 }