From: Marko Luukkainen <marko.luukkainen@semantum.fi>
Date: Fri, 29 Mar 2019 10:48:58 +0000 (+0000)
Subject: Merge "Improved logic to find imports/includes in SCLTextEditorEnvironement"
X-Git-Tag: v1.43.0~136^2~168
X-Git-Url: https://gerrit.simantics.org/r/gitweb?p=simantics%2Fplatform.git;a=commitdiff_plain;h=278798fde2299d295af15addb3053d7101ccb17c;hp=f193467af9ac7fec6c815a35c21d2309b1c6200e

Merge "Improved logic to find imports/includes in SCLTextEditorEnvironement"
---

diff --git a/bundles/org.simantics.scl.ui/src/org/simantics/scl/ui/editor/completion/SCLTextEditorEnvironment.java b/bundles/org.simantics.scl.ui/src/org/simantics/scl/ui/editor/completion/SCLTextEditorEnvironment.java
index ffe709f45..92133fd5a 100644
--- a/bundles/org.simantics.scl.ui/src/org/simantics/scl/ui/editor/completion/SCLTextEditorEnvironment.java
+++ b/bundles/org.simantics.scl.ui/src/org/simantics/scl/ui/editor/completion/SCLTextEditorEnvironment.java
@@ -45,12 +45,17 @@ public class SCLTextEditorEnvironment {
     
     public void updateEnvironment(IDocument document) {
         String contents = document.get();
+        // Strip triple quoted strings from the contents since they may contain lines that look exactly like normal imports / includes
+        contents = contents.replaceAll("(?s)\"\"\".*?\"\"\"", "\"\"");
+        // Strip multiline comments since they may contain lines that look exactly like normal imports / includes
+        contents = contents.replaceAll("(?s)/\\*.*?\\*/", "");
+
         String[] lines = contents.split("\\R+"); //$NON-NLS-1$
         List<ImportDeclaration> imports = new ArrayList<>();
         imports.add(new ImportDeclaration("StandardLibrary", "")); //$NON-NLS-1$ //$NON-NLS-2$
         for (String line : lines) {
             line = line.trim();
-            if (line.startsWith("import") || line.startsWith("include")) { //$NON-NLS-1$ //$NON-NLS-2$
+            if (line.startsWith("import ") || line.startsWith("include ")) { //$NON-NLS-1$ //$NON-NLS-2$
                 SCLParserImpl parser = new SCLParserImpl(new StringReader(line));
                 try {
                     ImportDeclaration importDecl = (ImportDeclaration)parser.parseImport();