Added fix for Parser#traitApplication() to avoid eating the ending ')…

…', Removed redundant foldingrange check in FoldingRangeHandler#processFoldingRangeForNode, Removed redundant param in FoldingRangeHandler#addFoldingRangeForImports
smithy-lang · Feb 12, 2025 · 9bd5681 · 9bd5681
1 parent 2b28e37
commit 9bd5681
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 10 deletions.
diff --git a/src/main/java/software/amazon/smithy/lsp/language/FoldingRangeHandler.java b/src/main/java/software/amazon/smithy/lsp/language/FoldingRangeHandler.java
@@ -39,7 +39,7 @@ private void addFoldingRange(List<FoldingRange> foldingRanges, int startIndex, i
         }
     }
 
-    private void addFoldingRangeForImports(List<FoldingRange> foldingRanges, DocumentImports documentImports) {
+    private void addFoldingRangeForImports(List<FoldingRange> foldingRanges) {
         Range range = documentImports.importsRange();
         if (range != null && isFoldable(range.getStart().getLine(), range.getEnd().getLine())) {
             foldingRanges.add(new FoldingRange(range.getStart().getLine(), range.getEnd().getLine()));
@@ -49,7 +49,7 @@ private void addFoldingRangeForImports(List<FoldingRange> foldingRanges, Documen
     private List<FoldingRange> generateFoldingRanges() {
         List<FoldingRange> foldingRanges = new ArrayList<>();
 
-        addFoldingRangeForImports(foldingRanges, documentImports);
+        addFoldingRangeForImports(foldingRanges);
 
         ListIterator<Syntax.Statement> iterator = statements.listIterator();
 
@@ -116,13 +116,6 @@ private void processFoldingRangeForNode(List<FoldingRange> foldingRanges, Syntax
             return;
         }
 
-        int startLine = document.lineOfIndex(node.start());
-        int endLine = document.lineOfIndex(node.end());
-
-        if (!isFoldable(startLine, endLine)) {
-            return;
-        }
-
         switch (node) {
             case Syntax.Node.Kvps kvps -> {
                 if (!kvps.kvps().isEmpty()) {

diff --git a/src/main/java/software/amazon/smithy/lsp/syntax/Parser.java b/src/main/java/software/amazon/smithy/lsp/syntax/Parser.java
@@ -155,7 +155,6 @@ private Syntax.Node traitNode() {
                     Syntax.Node.Kvps kvps = new Syntax.Node.Kvps();
                     setStart(kvps);
                     setEnd(kvps);
-                    skip();
                     yield kvps;
                 }