X-Git-Url: https://gerrit.simantics.org/r/gitweb?p=simantics%2Fplatform.git;a=blobdiff_plain;f=bundles%2Forg.simantics.scl.ui%2Fsrc%2Forg%2Fsimantics%2Fscl%2Fui%2Feditor2%2FOpenDeclaration.java;h=522b8d3ed22a4e097ad0e98722abad9e331e8612;hp=f8ea0c20d1b9960e4258cc53cf6898a77ffbc5f3;hb=8c3b0e2c8984ce7c9d61cdb1a47f199376702c86;hpb=cd25d2a522265d13a159babac67a3430eaa23ec2

diff --git a/bundles/org.simantics.scl.ui/src/org/simantics/scl/ui/editor2/OpenDeclaration.java b/bundles/org.simantics.scl.ui/src/org/simantics/scl/ui/editor2/OpenDeclaration.java
index f8ea0c20d..522b8d3ed 100644
--- a/bundles/org.simantics.scl.ui/src/org/simantics/scl/ui/editor2/OpenDeclaration.java
+++ b/bundles/org.simantics.scl.ui/src/org/simantics/scl/ui/editor2/OpenDeclaration.java
@@ -46,14 +46,27 @@ public class OpenDeclaration extends AbstractHandler {
         return text.substring(startPos, endPos);
     }
     
-    public static String extractAt(String text, int caretPos) {
+    public static String extractIdentifierOrSymbolAt(String text, int caretPos) {
         String result = extractIdentifierAt(text, caretPos);
         if(!result.isEmpty())
             return result;
         return extractSymbolAt(text, caretPos);
     }
-
     
+    private static String extractLineAt(String text, int caretPos) {
+        int startPos = caretPos;
+        while(startPos > 0 && !isNewline(text.charAt(startPos-1)))
+            --startPos;
+        int endPos = caretPos;
+        while(endPos < text.length() && !isNewline(text.charAt(endPos)))
+            ++endPos;
+        return text.substring(startPos, endPos);
+    }
+    
+    private static boolean isNewline(char c) {
+        return c=='\n' || c=='\r';
+    }
+
     @Override
     public Object execute(ExecutionEvent event) throws ExecutionException {
         IEditorPart editor = 
@@ -62,14 +75,28 @@ public class OpenDeclaration extends AbstractHandler {
             return null;
         SCLModuleEditor2 moduleEditor = (SCLModuleEditor2)editor;
         StyledText styledText = (StyledText)moduleEditor.getAdapter(Control.class);
-        String identifierAtCaret = extractAt(styledText.getText(), styledText.getCaretOffset());
-        if(identifierAtCaret.isEmpty())
-            return null;
-        SCLTextEditorEnvironment editorEnvironment = moduleEditor.getSCLTextEditorEnvironment();
-        editorEnvironment.updateEnvironment(moduleEditor.getDocument());
-        SCLValue value = editorEnvironment.getValue(identifierAtCaret);
-        if(value != null)
-            OpenSCLDefinition.openDefinition(value);
+        String text = styledText.getText();
+        int caretOffset = styledText.getCaretOffset();
+        
+        // Find the line where the caret is
+        String lineAtCaret = extractLineAt(text, caretOffset);
+        if(lineAtCaret.startsWith("import ") || lineAtCaret.startsWith("include ")) {
+            int p1 = lineAtCaret.indexOf('"', 6);
+            int p2 = lineAtCaret.indexOf('"', p1+1);
+            String moduleName = lineAtCaret.substring(p1+1, p2);
+            OpenSCLModule.openModule(moduleName);
+        }
+        else {
+            // Try to find an identifier at caret
+            String identifierAtCaret = extractIdentifierOrSymbolAt(text, caretOffset);
+            if(identifierAtCaret.isEmpty())
+                return null;
+            SCLTextEditorEnvironment editorEnvironment = moduleEditor.getSCLTextEditorEnvironment();
+            editorEnvironment.updateEnvironment(moduleEditor.getDocument());
+            SCLValue value = editorEnvironment.getValue(identifierAtCaret);
+            if(value != null)
+                OpenSCLDefinition.openDefinition(value);
+        }
         return null;
     }