Changeset 438 for java/Framclipse/com.framsticks.framclipse.ui/src/com/framsticks/framclipse/ui/FramScriptSourceViewerConfiguration.java

Timestamp:

10/18/15 23:05:09 (9 years ago)

Author:

Mateusz Poszwa

Message:

Ported Framclipse to Xtext 2.8.4

File:

• java/Framclipse/com.framsticks.framclipse.ui/src/com/framsticks/framclipse/ui/FramScriptSourceViewerConfiguration.java (modified) (2 diffs)

java/Framclipse/com.framsticks.framclipse.ui/src/com/framsticks/framclipse/ui/FramScriptSourceViewerConfiguration.java

@@ -12 +12 @@
 import org.eclipse.jface.text.source.ISourceViewer;
 import org.eclipse.swt.widgets.Shell;
-import org.eclipse.xtext.parsetree.AbstractNode;
-import org.eclipse.xtext.parsetree.CompositeNode;
-import org.eclipse.xtext.parsetree.NodeUtil;
-import org.eclipse.xtext.parsetree.ParseTreeUtil;
+import org.eclipse.xtext.nodemodel.ICompositeNode;
+import org.eclipse.xtext.nodemodel.ILeafNode;
+import org.eclipse.xtext.nodemodel.util.NodeModelUtils;
 import org.eclipse.xtext.resource.XtextResource;
 import org.eclipse.xtext.ui.editor.XtextSourceViewerConfiguration;
@@ -62 +61 @@
                                         @Override
                                         public String exec(XtextResource state) throws Exception {
-                                                CompositeNode root = state.getParseResult().getRootNode();
-                                                AbstractNode current = ParseTreeUtil.getCurrentOrFollowingNodeByOffset(root, offset);
-                                                EObject semantic = NodeUtil.getNearestSemanticObject(current);
+                                                ICompositeNode root = state.getParseResult().getRootNode();
+//                                              AbstractNode current = ParseTreeUtil.getCurrentOrFollowingNodeByOffset(root, offset);
+                                                ILeafNode current = NodeModelUtils.findLeafNodeAtOffset(root, offset);
+//                                              EObject semantic = NodeUtil.getNearestSemanticObject(current);
+                                                EObject semantic = current.getSemanticElement();
 
                                                 if (semantic instanceof QualifiedExpression) {