Fix for #1603: adjust offsets of qualified types in throws clause

groovy · Dec 3, 2024 · a19a517 · a19a517
1 parent 142f93f
commit a19a517
Show file tree

Hide file tree

Showing 4 changed files with 49 additions and 0 deletions.
diff --git a/base/org.codehaus.groovy30/src/org/codehaus/groovy/antlr/AntlrParserPlugin.java b/base/org.codehaus.groovy30/src/org/codehaus/groovy/antlr/AntlrParserPlugin.java
@@ -1180,8 +1180,20 @@ protected void throwsList(AST node, List<ClassNode> list) {
         } else {
             name = identifier(node);
         }
+        /* GRECLIPSE edit
         ClassNode exception = ClassHelper.make(name);
+        */
+        ClassNode exception = makeClassNode(name);
+        // GRECLIPSE end
         configureAST(exception, node);
+        // GRECLIPSE add
+        if (isType(DOT, node)) {
+            GroovySourceAST type = (GroovySourceAST) node.getFirstChild().getNextSibling();
+            exception.setNameStart2(locations.findOffset(type.getLine(), type.getColumn()));
+            exception.setEnd(locations.findOffset(type.getLineLast(), type.getColumnLast()));
+            exception.setLastLineNumber(type.getLineLast()); exception.setLastColumnNumber(type.getColumnLast());
+        }
+        // GRECLIPSE end
         list.add(exception);
         AST next = node.getNextSibling();
         if (next != null) throwsList(next, list);

diff --git a/base/org.codehaus.groovy40/src/org/codehaus/groovy/antlr/AntlrParserPlugin.java b/base/org.codehaus.groovy40/src/org/codehaus/groovy/antlr/AntlrParserPlugin.java
@@ -1180,8 +1180,20 @@ protected void throwsList(AST node, List<ClassNode> list) {
         } else {
             name = identifier(node);
         }
+        /* GRECLIPSE edit
         ClassNode exception = ClassHelper.make(name);
+        */
+        ClassNode exception = makeClassNode(name);
+        // GRECLIPSE end
         configureAST(exception, node);
+        // GRECLIPSE add
+        if (isType(DOT, node)) {
+            GroovySourceAST type = (GroovySourceAST) node.getFirstChild().getNextSibling();
+            exception.setNameStart2(locations.findOffset(type.getLine(), type.getColumn()));
+            exception.setEnd(locations.findOffset(type.getLineLast(), type.getColumnLast()));
+            exception.setLastLineNumber(type.getLineLast()); exception.setLastColumnNumber(type.getColumnLast());
+        }
+        // GRECLIPSE end
         list.add(exception);
         AST next = node.getNextSibling();
         if (next != null) throwsList(next, list);

diff --git a/base/org.codehaus.groovy50/src/org/codehaus/groovy/antlr/AntlrParserPlugin.java b/base/org.codehaus.groovy50/src/org/codehaus/groovy/antlr/AntlrParserPlugin.java
@@ -1182,8 +1182,20 @@ protected void throwsList(AST node, List<ClassNode> list) {
         } else {
             name = identifier(node);
         }
+        /* GRECLIPSE edit
         ClassNode exception = ClassHelper.make(name);
+        */
+        ClassNode exception = makeClassNode(name);
+        // GRECLIPSE end
         configureAST(exception, node);
+        // GRECLIPSE add
+        if (isType(DOT, node)) {
+            var type = (GroovySourceAST) node.getFirstChild().getNextSibling();
+            exception.setNameStart2(locations.findOffset(type.getLine(), type.getColumn()));
+            exception.setEnd(locations.findOffset(type.getLineLast(), type.getColumnLast()));
+            exception.setLastLineNumber(type.getLineLast()); exception.setLastColumnNumber(type.getColumnLast());
+        }
+        // GRECLIPSE end
         list.add(exception);
         AST next = node.getNextSibling();
         if (next != null) throwsList(next, list);

diff --git a/...vy.eclipse.tests/src/org/codehaus/groovy/eclipse/test/ui/SemanticHighlightingTests.groovy b/...vy.eclipse.tests/src/org/codehaus/groovy/eclipse/test/ui/SemanticHighlightingTests.groovy
@@ -5268,6 +5268,19 @@ final class SemanticHighlightingTests extends GroovyEclipseTestSuite {
             new HighlightedTypedPosition(contents.indexOf('String'), 6, CLASS))
     }
 
+    @Test // https://github.com/groovy/groovy-eclipse/issues/1603
+    void testQualifiedType9() {
+        String contents = '''\
+            |def foo() throws java.lang.Exception , java.lang.Throwable {
+            |}
+            |'''.stripMargin()
+
+        assertHighlighting(contents,
+            new HighlightedTypedPosition(contents.indexOf('foo'), 3, METHOD),
+            new HighlightedTypedPosition(contents.indexOf('Exception'), 9, CLASS),
+            new HighlightedTypedPosition(contents.indexOf('Throwable'), 9, CLASS))
+    }
+
     @Test
     void testSwitch1() {
         assumeTrue(isParrotParser() && isAtLeastGroovy(40))