rework console hyperlinks

groovy · Jan 16, 2020 · 52a0e33 · 52a0e33
1 parent 62e711d
commit 52a0e33
Show file tree

Hide file tree

Showing 6 changed files with 44 additions and 444 deletions.
diff --git a/ide-test/org.codehaus.groovy.alltests/src/org/codehaus/groovy/alltests/AllGroovyTests.groovy b/ide-test/org.codehaus.groovy.alltests/src/org/codehaus/groovy/alltests/AllGroovyTests.groovy
@@ -1,5 +1,5 @@
 /*
- * Copyright 2009-2019 the original author or authors.
+ * Copyright 2009-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -142,7 +142,6 @@ import org.junit.runners.Suite
     org.codehaus.groovy.eclipse.test.core.util.TokenStreamTests,
     org.codehaus.groovy.eclipse.test.debug.BreakpointLocationTests,
     org.codehaus.groovy.eclipse.test.debug.DebugBreakpointsTests,
-    org.codehaus.groovy.eclipse.test.launch.ConsoleLineTrackerTests,
     org.codehaus.groovy.eclipse.test.launch.GroovyScriptLaunchShortcutTests,
     org.codehaus.groovy.eclipse.test.search.FindOccurrencesTests,
     org.codehaus.groovy.eclipse.test.ui.BracketInserterTests,

diff --git a/ide-test/org.codehaus.groovy.eclipse.tests/plugin.xml b/ide-test/org.codehaus.groovy.eclipse.tests/plugin.xml
@@ -47,11 +47,4 @@
          </appliesTo>
       </lookup>
    </extension>
-   <extension point="org.eclipse.debug.ui.consoleLineTrackers">
-      <consoleLineTracker
-            class="org.codehaus.groovy.eclipse.test.launch.ConsoleLineTracker"
-            processType="java"
-            id="org.eclipse.jdt.debug.tests.ConsoleLineTracker">
-      </consoleLineTracker>
-   </extension>
 </plugin>
diff --git a/....groovy.eclipse.tests/src/org/codehaus/groovy/eclipse/test/launch/ConsoleLineTracker.java b/....groovy.eclipse.tests/src/org/codehaus/groovy/eclipse/test/launch/ConsoleLineTracker.java
diff --git a/....eclipse.tests/src/org/codehaus/groovy/eclipse/test/launch/ConsoleLineTrackerTests.groovy b/....eclipse.tests/src/org/codehaus/groovy/eclipse/test/launch/ConsoleLineTrackerTests.groovy
diff --git a/ide/org.codehaus.groovy.eclipse.ui/plugin.xml b/ide/org.codehaus.groovy.eclipse.ui/plugin.xml
@@ -924,17 +924,20 @@
       </sequenceModifier>
    </extension>
 
-   <extension point="org.eclipse.debug.ui.consoleLineTrackers">
-      <consoleLineTracker
-         class="org.codehaus.groovy.eclipse.launchers.GroovyConsoleLineTracker"
-         id="org.codehaus.groovy.eclipse.launchers.GroovyConsoleLineTrackerForJava"
-         processType="java">
-      </consoleLineTracker>
-      <consoleLineTracker
-         class="org.codehaus.groovy.eclipse.launchers.GroovyConsoleLineTracker"
-         id="org.codehaus.groovy.eclipse.launchers.GroovyConsoleLineTrackerForGroovy"
-         processType="groovy">
-      </consoleLineTracker>
+   <extension point="org.eclipse.ui.console.consolePatternMatchListeners">
+      <consolePatternMatchListener id="org.codehaus.groovy.eclipse.ConsoleTracker"
+            class="org.codehaus.groovy.eclipse.launchers.GroovyConsoleLineTracker"
+            qualifier="\.groovy\)"
+            regex="(\p{javaJavaIdentifierStart}\p{javaJavaIdentifierPart}*\.)*\p{javaJavaIdentifierStart}\p{javaJavaIdentifierPart}*\(\w+\.groovy\)">
+         <enablement>
+            <or>
+               <test property="org.eclipse.debug.ui.processTypeTest" value="java"/>
+               <test property="org.eclipse.debug.ui.processTypeTest" value="groovy"/>
+               <test property="org.eclipse.ui.console.consoleTypeTest" value="javaStackTraceConsole"/>
+               <test property="org.eclipse.debug.ui.processTypeTest" value="org.eclipse.ant.ui.antProcess"/>
+            </or>
+         </enablement>
+      </consolePatternMatchListener>
    </extension>
 
    <extension point="org.eclipse.core.runtime.preferences">