diff options
Diffstat (limited to 'plugins/org.eclipse.etrice.core.room.ui/src/org/eclipse/etrice/core/ui/hover/RoomHoverProvider.xtend')
| -rw-r--r-- | plugins/org.eclipse.etrice.core.room.ui/src/org/eclipse/etrice/core/ui/hover/RoomHoverProvider.xtend | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/plugins/org.eclipse.etrice.core.room.ui/src/org/eclipse/etrice/core/ui/hover/RoomHoverProvider.xtend b/plugins/org.eclipse.etrice.core.room.ui/src/org/eclipse/etrice/core/ui/hover/RoomHoverProvider.xtend index 69c5d5fcd..428b519fc 100644 --- a/plugins/org.eclipse.etrice.core.room.ui/src/org/eclipse/etrice/core/ui/hover/RoomHoverProvider.xtend +++ b/plugins/org.eclipse.etrice.core.room.ui/src/org/eclipse/etrice/core/ui/hover/RoomHoverProvider.xtend @@ -15,10 +15,11 @@ package org.eclipse.etrice.core.ui.hover import com.google.inject.Inject +import org.eclipse.emf.ecore.EObject import org.eclipse.etrice.core.common.ui.hover.KeywordEObjectTextHover import org.eclipse.etrice.core.fsm.fSM.DetailCode import org.eclipse.etrice.core.services.RoomGrammarAccess -import org.eclipse.etrice.dctools.ast.DCUtil +import org.eclipse.etrice.core.ui.util.UIExpressionUtil import org.eclipse.jface.text.Region import org.eclipse.xtext.RuleCall import org.eclipse.xtext.nodemodel.util.NodeModelUtils @@ -27,8 +28,8 @@ import org.eclipse.xtext.util.Tuples class RoomHoverProvider extends KeywordEObjectTextHover { - @Inject RoomGrammarAccess grammar - @Inject DCUtil util + @Inject + RoomGrammarAccess grammar override protected getXtextElementAt(XtextResource resource, int offset) { // lookup expression @@ -37,13 +38,9 @@ class RoomHoverProvider extends KeywordEObjectTextHover { val leafNode = NodeModelUtils.findLeafNodeAtOffset(parseResult.rootNode, offset) if(leafNode?.grammarElement instanceof RuleCall) { if((leafNode.grammarElement as RuleCall).rule == grammar.CC_STRINGRule && leafNode.semanticElement instanceof DetailCode){ -// println("RoomHoverProvider at offset " + offset + " " + leafNode.offset + " " + leafNode.text.substring(offset - leafNode.offset)) - val result = util.findAtOffset(leafNode, offset) - if (result!==null) { -// val begin = result.begin -// println("RoomHoverProvider hit " + (leafNode.offset + result.begin) +" " + result.length + " " + leafNode.text.substring(begin, begin + result.length)) - return Tuples.create(result.object, new Region(leafNode.offset + result.begin, result.length)) - } + val exprFeature = UIExpressionUtil.findAtOffset(leafNode, offset) + if(exprFeature?.data instanceof EObject) + return Tuples.create(exprFeature.data as EObject, new Region(offset, exprFeature.id.length)) } } } |