-
Notifications
You must be signed in to change notification settings - Fork 308
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #101 from dotta/master
Fixed Hyperlinking regression in classfiles
- Loading branch information
Showing
5 changed files
with
74 additions
and
41 deletions.
There are no files selected for viewing
16 changes: 11 additions & 5 deletions
16
org.scala-ide.sdt.core/src/scala/tools/eclipse/actions/OpenImplicitCommand.scala
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
33 changes: 7 additions & 26 deletions
33
org.scala-ide.sdt.core/src/scala/tools/eclipse/ui/actions/HyperlinkOpenAction.scala
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,33 +1,14 @@ | ||
| package scala.tools.eclipse.ui.actions | ||
|
|
||
| import org.eclipse.jdt.ui.actions.OpenAction | ||
| import scala.tools.eclipse.ScalaSourceFileEditor | ||
| import org.eclipse.jface.text.ITextSelection | ||
| import org.eclipse.jdt.internal.ui.javaeditor.EditorUtility | ||
| import scala.tools.eclipse.javaelements.ScalaCompilationUnit | ||
| import org.eclipse.jdt.internal.ui.javaeditor.JavaEditor | ||
| import scala.tools.eclipse.hyperlink.text.detector.BaseHyperlinkDetector | ||
| import scala.tools.eclipse.util.EditorUtils | ||
| import org.eclipse.jface.text.TextSelection | ||
| import org.eclipse.jface.text.ITextViewer | ||
|
|
||
| class HyperlinkOpenAction(detectionStrategy: BaseHyperlinkDetector, editor: JavaEditor) extends OpenAction(editor) { | ||
| import scala.tools.eclipse.hyperlink.text.detector.DeclarationHyperlinkDetector | ||
|
|
||
| override def run() { | ||
| withScalaCompilatioUnit { | ||
| _.followReference(detectionStrategy, editor, getSelectionProvider.getSelection.asInstanceOf[ITextSelection]) | ||
| } | ||
| } | ||
| import org.eclipse.jdt.internal.ui.javaeditor.JavaEditor | ||
| import org.eclipse.jdt.ui.actions.OpenAction | ||
|
|
||
| private def withScalaCompilatioUnit[T](f: ScalaCompilationUnit => T): Option[T] = { | ||
| val inputJavaElement = EditorUtility.getEditorInputJavaElement(editor, false) | ||
| Option(inputJavaElement) map (_.asInstanceOf[ScalaCompilationUnit]) map (f) | ||
| } | ||
| class HyperlinkOpenAction(editor: JavaEditor) extends OpenAction(editor) with HyperlinkOpenActionStrategy { | ||
|
|
||
| override def isEnabled: Boolean = getSelectionProvider.getSelection match { | ||
| case textSelection: TextSelection => | ||
| val region = EditorUtils.textSelection2region(textSelection) | ||
| detectionStrategy.detectHyperlinks(editor.getViewer, region, canShowMultipleHyperlinks = false) != null | ||
| case _ => false | ||
| } | ||
| override protected val detectionStrategy: BaseHyperlinkDetector = DeclarationHyperlinkDetector() | ||
|
|
||
| override def run() { openHyperlink(editor) } | ||
| } |
33 changes: 33 additions & 0 deletions
33
org.scala-ide.sdt.core/src/scala/tools/eclipse/ui/actions/HyperlinkOpenActionStrategy.scala
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,33 @@ | ||
| package scala.tools.eclipse.ui.actions | ||
|
|
||
| import scala.tools.eclipse.hyperlink.text.detector.BaseHyperlinkDetector | ||
| import scala.tools.eclipse.javaelements.ScalaCompilationUnit | ||
| import scala.tools.eclipse.util.EditorUtils | ||
|
|
||
| import org.eclipse.jdt.internal.ui.javaeditor.EditorUtility | ||
| import org.eclipse.jdt.internal.ui.javaeditor.JavaEditor | ||
| import org.eclipse.jface.text.ITextSelection | ||
|
|
||
| trait HyperlinkOpenActionStrategy { | ||
| protected def detectionStrategy: BaseHyperlinkDetector | ||
|
|
||
| protected def openHyperlink(editor: JavaEditor) { | ||
| getTextSelection(editor) map { selection => | ||
| withScalaCompilatioUnit(editor) { scu => | ||
| scu.followReference(detectionStrategy, editor, selection) | ||
| } | ||
| } | ||
| } | ||
|
|
||
| private def withScalaCompilatioUnit[T](editor: JavaEditor)(f: ScalaCompilationUnit => T): Option[T] = { | ||
| val inputJavaElement = EditorUtility.getEditorInputJavaElement(editor, false) | ||
| Option(inputJavaElement) map (_.asInstanceOf[ScalaCompilationUnit]) map (f) | ||
| } | ||
|
|
||
| protected def isEnabled(editor: JavaEditor): Boolean = getTextSelection(editor) map { textSelection => | ||
| val region = EditorUtils.textSelection2region(textSelection) | ||
| detectionStrategy.detectHyperlinks(editor, region, canShowMultipleHyperlinks = false) != null | ||
| } getOrElse(false) | ||
|
|
||
| private def getTextSelection(editor: JavaEditor): Option[ITextSelection] = EditorUtils.getTextSelection(editor) | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters