Changeset 440 for java/Framclipse/com.framsticks.framclipse/src/com/framsticks/framclipse/resource/FramScriptResourceDescription.java

Timestamp:

10/21/15 02:55:11 (8 years ago)

Author:

Mateusz Poszwa

Message:

• Updated Xtext-based Framclipse
• Deleted previous version of Framclipse

File:

• java/Framclipse/com.framsticks.framclipse/src/com/framsticks/framclipse/resource/FramScriptResourceDescription.java (modified) (3 diffs)

java/Framclipse/com.framsticks.framclipse/src/com/framsticks/framclipse/resource/FramScriptResourceDescription.java

@@ -13 +13 @@
 import com.framsticks.framclipse.framScript.State;
 import com.framsticks.framclipse.framScript.VariableDeclaration;
+import com.framsticks.framclipse.framScript.VariableDeclarations;
 import com.google.common.base.Predicate;
 import com.google.common.collect.Iterables;
@@ -19 +20 @@
 public class FramScriptResourceDescription extends DefaultResourceDescription {
 
+        private Resource resource;
+
         public FramScriptResourceDescription(Resource resource,
                         IDefaultResourceDescriptionStrategy resourceDescriptionStrategy) {
                 super(resource, resourceDescriptionStrategy);
+                this.resource = resource;
         }
 
@@ -49 +53 @@
                 if (input instanceof VariableDeclaration) {
                         VariableDeclaration dec = (VariableDeclaration) input;
-                        return dec.eContainer().eContainer() instanceof Code;
+                        EObject decs = dec.eContainer();
+                        return decs instanceof VariableDeclarations &&
+                                        (decs.eContainer() instanceof Code ||
+                                                        "inc".equals(resource.getURI().fileExtension()) &&
+                                                        decs.eContainer().eContainer() == null);
                 }
                 return false;