fix review

web-lsp · Dec 19, 2024 · 1b5f0d8 · 1b5f0d8
1 parent 18b602f
commit 1b5f0d8
Show file tree

Hide file tree

Showing 2 changed files with 124 additions and 0 deletions.
diff --git a/crates/csslsrs/src/features/document_symbols.rs b/crates/csslsrs/src/features/document_symbols.rs
@@ -36,6 +36,7 @@ fn extract_document_symbols(
                         Range::new(
                             position(
                                 line_index,
+                                // We need to include the `@` symbol in the selection range.
                                 token.text_trimmed_range().start() - TextSize::from(1),
                                 encoding,
                             )

diff --git a/crates/csslsrs/tests/document_symbols.rs b/crates/csslsrs/tests/document_symbols.rs
@@ -606,3 +606,126 @@ fn test_css_variables() {
         ],
     );
 }
+
+#[test]
+fn test_at_rule_with_nested_properties() {
+    let mut ls = LanguageService::default();
+
+    assert_document_symbols(
+        &mut ls,
+        "@font-palette-values --my-palette {\n  font-family: Bixa;\n  base-palette: 1;\n  override-colors: 0 #ff0000;\n}",
+        vec![DocumentSymbol {
+            name: "@font-palette-values".to_string(),
+            detail: None,
+            kind: SymbolKind::NAMESPACE,
+            tags: None,
+            deprecated: None,
+            range: Range {
+                start: Position {
+                    line: 0,
+                    character: 0,
+                },
+                end: Position {
+                    line: 4,
+                    character: 1,
+                },
+            },
+            selection_range: Range {
+                start: Position {
+                    line: 0,
+                    character: 0,
+                },
+                end: Position {
+                    line: 0,
+                    character: 20,
+                },
+            },
+            children: Some(vec![
+                DocumentSymbol {
+                    name: "font-family".to_string(),
+                    detail: None,
+                    kind: SymbolKind::PROPERTY,
+                    tags: None,
+                    deprecated: None,
+                    range: Range {
+                        start: Position {
+                            line: 1,
+                            character: 2,
+                        },
+                        end: Position {
+                            line: 1,
+                            character: 19,
+                        },
+                    },
+                    selection_range: Range {
+                        start: Position {
+                            line: 1,
+                            character: 2,
+                        },
+                        end: Position {
+                            line: 1,
+                            character: 13,
+                        },
+                    },
+                    children: None,
+                },
+                DocumentSymbol {
+                    name: "base-palette".to_string(),
+                    detail: None,
+                    kind: SymbolKind::PROPERTY,
+                    tags: None,
+                    deprecated: None,
+                    range: Range {
+                        start: Position {
+                            line: 2,
+                            character: 2,
+                        },
+                        end: Position {
+                            line: 2,
+                            character: 17,
+                        },
+                    },
+                    selection_range: Range {
+                        start: Position {
+                            line: 2,
+                            character: 2,
+                        },
+                        end: Position {
+                            line: 2,
+                            character: 14,
+                        },
+                    },
+                    children: None,
+                },
+                DocumentSymbol {
+                    name: "override-colors".to_string(),
+                    detail: None,
+                    kind: SymbolKind::PROPERTY,
+                    tags: None,
+                    deprecated: None,
+                    range: Range {
+                        start: Position {
+                            line: 3,
+                            character: 2,
+                        },
+                        end: Position {
+                            line: 3,
+                            character: 28,
+                        },
+                    },
+                    selection_range: Range {
+                        start: Position {
+                            line: 3,
+                            character: 2,
+                        },
+                        end: Position {
+                            line: 3,
+                            character: 17,
+                        },
+                    },
+                    children: None,
+                },
+            ]),
+            }],
+    );
+}