Bug 495466 - Use base support for Java like highlighting

2 files changed, 4 insertions, 4 deletions

diff --git a/bundles/code/org.eclipse.fx.code.editor.configuration.text.fx/src/org/eclipse/fx/code/editor/configuration/text/fx/internal/ConfigurationRuleScanner.java b/bundles/code/org.eclipse.fx.code.editor.configuration.text.fx/src/org/eclipse/fx/code/editor/configuration/text/fx/internal/ConfigurationRuleScanner.java
index 95ed07208..13b362b86 100644
--- a/bundles/code/org.eclipse.fx.code.editor.configuration.text.fx/src/org/eclipse/fx/code/editor/configuration/text/fx/internal/ConfigurationRuleScanner.java
+++ b/bundles/code/org.eclipse.fx.code.editor.configuration.text.fx/src/org/eclipse/fx/code/editor/configuration/text/fx/internal/ConfigurationRuleScanner.java
@@ -71,7 +71,7 @@ public class ConfigurationRuleScanner extends RuleBasedScanner {
 								endSeq,
 								token,
 								sru.getEscapedBy() != null ? sru.getEscapedBy().charAt(0) : 0,
-								endSeq == null || endSeq.isEmpty())));
+								true)));
 					} else if( ru instanceof TokenScanner_MultiLineRule ) {
 						TokenScanner_MultiLineRule sml = (TokenScanner_MultiLineRule) ru;
 						String endSeq = sml.getEndSeq();
@@ -80,7 +80,7 @@ public class ConfigurationRuleScanner extends RuleBasedScanner {
 								endSeq,
 								token,
 								sml.getEscapedBy() != null ? sml.getEscapedBy().charAt(0) : 0,
-								endSeq == null || endSeq.isEmpty())));
+								true)));
 					} else if( ru instanceof TokenScanner_CharacterRule ) {
 						TokenScanner_CharacterRule scr = (TokenScanner_CharacterRule) ru;
 						char[] c = new char[scr.getCharacterList().size()];
diff --git a/bundles/code/org.eclipse.fx.code.editor.configuration.text/src/org/eclipse/fx/code/editor/configuration/text/internal/ConfigurationRuleBasedPartitionScanner.java b/bundles/code/org.eclipse.fx.code.editor.configuration.text/src/org/eclipse/fx/code/editor/configuration/text/internal/ConfigurationRuleBasedPartitionScanner.java
index 00365e9a4..711788efa 100644
--- a/bundles/code/org.eclipse.fx.code.editor.configuration.text/src/org/eclipse/fx/code/editor/configuration/text/internal/ConfigurationRuleBasedPartitionScanner.java
+++ b/bundles/code/org.eclipse.fx.code.editor.configuration.text/src/org/eclipse/fx/code/editor/configuration/text/internal/ConfigurationRuleBasedPartitionScanner.java
@@ -46,12 +46,12 @@ public class ConfigurationRuleBasedPartitionScanner extends RuleBasedPartitionSc
 						PartitionRule_SingleLine sr = (PartitionRule_SingleLine) r;
 						String endSeq = sr.getEndSeq();
 						String escapeSeq = sr.getEscapedBy();
-						pr.add( (IPredicateRule) Util.wrap(r.getCheck(),new SingleLineRule(sr.getStartSeq(), endSeq, new Token(p.getName()), escapeSeq != null ? escapeSeq.charAt(0) : 0, endSeq == null || endSeq.isEmpty())));
+						pr.add( (IPredicateRule) Util.wrap(r.getCheck(),new SingleLineRule(sr.getStartSeq(), endSeq, new Token(p.getName()), escapeSeq != null ? escapeSeq.charAt(0) : 0, true)));
 					} else if( r instanceof PartitionRule_MultiLine ) {
 						PartitionRule_MultiLine mr = (PartitionRule_MultiLine) r;
 						String endSeq = mr.getEndSeq();
 						String escapeSeq = mr.getEscapedBy();
-						pr.add( (IPredicateRule) Util.wrap(r.getCheck(), new MultiLineRule(mr.getStartSeq(), endSeq, new Token(p.getName()), escapeSeq != null ? escapeSeq.charAt(0) : 0, endSeq == null || endSeq.isEmpty())));
+						pr.add( (IPredicateRule) Util.wrap(r.getCheck(), new MultiLineRule(mr.getStartSeq(), endSeq, new Token(p.getName()), escapeSeq != null ? escapeSeq.charAt(0) : 0, true)));
 					} else if( r instanceof PartitionRule_JavaScript ) {
 						PartitionRule_JavaScript jr = (PartitionRule_JavaScript) r;