Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuergen Haug2017-10-25 10:27:41 +0000
committerJuergen Haug2017-10-25 10:27:41 +0000
commit8415b4abc4ddf7e41ff732d105f54c548ded2935 (patch)
treed359fd5d8c04c4b95d283121f41351d9fade7dfc /plugins
parente56b926de863ea97af54427db6321d988ebdabda (diff)
downloadorg.eclipse.etrice-8415b4abc4ddf7e41ff732d105f54c548ded2935.tar.gz
org.eclipse.etrice-8415b4abc4ddf7e41ff732d105f54c548ded2935.tar.xz
org.eclipse.etrice-8415b4abc4ddf7e41ff732d105f54c548ded2935.zip
[targetLang] fixed single line highlight
Diffstat (limited to 'plugins')
-rw-r--r--plugins/org.eclipse.etrice.core.room.ui/src/org/eclipse/etrice/core/ui/highlight/RoomSemanticHighlightingCalculator.java12
1 files changed, 8 insertions, 4 deletions
diff --git a/plugins/org.eclipse.etrice.core.room.ui/src/org/eclipse/etrice/core/ui/highlight/RoomSemanticHighlightingCalculator.java b/plugins/org.eclipse.etrice.core.room.ui/src/org/eclipse/etrice/core/ui/highlight/RoomSemanticHighlightingCalculator.java
index ede09f6b8..afbb17450 100644
--- a/plugins/org.eclipse.etrice.core.room.ui/src/org/eclipse/etrice/core/ui/highlight/RoomSemanticHighlightingCalculator.java
+++ b/plugins/org.eclipse.etrice.core.room.ui/src/org/eclipse/etrice/core/ui/highlight/RoomSemanticHighlightingCalculator.java
@@ -14,6 +14,7 @@ package org.eclipse.etrice.core.ui.highlight;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.etrice.core.common.ui.highlight.BaseSemanticHighlighter;
+import org.eclipse.etrice.core.converter.RoomValueConverterService;
import org.eclipse.etrice.core.fsm.fSM.DetailCode;
import org.eclipse.etrice.core.services.RoomGrammarAccess;
import org.eclipse.etrice.core.ui.util.UIExpressionUtil;
@@ -42,6 +43,9 @@ public class RoomSemanticHighlightingCalculator extends BaseSemanticHighlighter
@Inject
RoomGrammarAccess grammar;
+ @Inject
+ RoomValueConverterService converterService;
+
@Override
protected void provideHighlightingFor(INode node, XtextResource resource, IHighlightedPositionAcceptor acceptor) {
super.provideHighlightingFor(node, resource, acceptor);
@@ -56,16 +60,16 @@ public class RoomSemanticHighlightingCalculator extends BaseSemanticHighlighter
RoomHighlightingConfiguration.HL_ANNOTATION_ID);
}
else if(node.getParent().getSemanticElement() instanceof DetailCode && ruleCall.getRule() == grammar.getCC_STRINGRule()) {
- keywordHighlight(node, acceptor);
+ detailCodeHighlight(node, acceptor);
}
}
}
- protected void keywordHighlight(INode node, IHighlightedPositionAcceptor acceptor) {
- final String text = node.getText();
- final int offset = node.getOffset();
+ protected void detailCodeHighlight(INode node, IHighlightedPositionAcceptor acceptor) {
+ final String text = converterService.getCC_StringConverter().stripDelim(node.getText());
+ final int offset = node.getOffset() + converterService.getCC_StringConverter().getDelim().length();
IDetailExpressionProvider exprProvider = UIExpressionUtil.selectExpressionProvider(node.getSemanticElement().eContainer());
XtextHighlightStyles styles = new XtextHighlightStyles();
RuleBasedScanner scanner = new RuleBasedScanner();

Back to the top