Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfbecker2009-11-14 13:35:06 +0000
committerfbecker2009-11-14 13:35:06 +0000
commitc673ae8f45dec9854f64b2cd9b5aab797d6ab75e (patch)
tree1b3b830b01b368def0ce8998200195573e69b393 /org.eclipse.mylyn.tasks.ui
parent5a9245e28b03c0ec7f89efcb2e4bc9ed1d3c54c5 (diff)
downloadorg.eclipse.mylyn.tasks-c673ae8f45dec9854f64b2cd9b5aab797d6ab75e.tar.gz
org.eclipse.mylyn.tasks-c673ae8f45dec9854f64b2cd9b5aab797d6ab75e.tar.xz
org.eclipse.mylyn.tasks-c673ae8f45dec9854f64b2cd9b5aab797d6ab75e.zip
ASSIGNED - bug 291343: too much text highlighted when link is in bug<space>#<number> format
https://bugs.eclipse.org/bugs/show_bug.cgi?id=291343
Diffstat (limited to 'org.eclipse.mylyn.tasks.ui')
-rw-r--r--org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/RepositoryTextViewerConfiguration.java24
1 files changed, 7 insertions, 17 deletions
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/RepositoryTextViewerConfiguration.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/RepositoryTextViewerConfiguration.java
index 5043ce2be..7a256d768 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/RepositoryTextViewerConfiguration.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/RepositoryTextViewerConfiguration.java
@@ -32,7 +32,6 @@ import org.eclipse.jface.text.reconciler.IReconciler;
import org.eclipse.jface.text.rules.DefaultDamagerRepairer;
import org.eclipse.jface.text.rules.IRule;
import org.eclipse.jface.text.rules.IToken;
-import org.eclipse.jface.text.rules.MultiLineRule;
import org.eclipse.jface.text.rules.RuleBasedScanner;
import org.eclipse.jface.text.rules.SingleLineRule;
import org.eclipse.jface.text.rules.Token;
@@ -190,28 +189,19 @@ public class RepositoryTextViewerConfiguration extends TextSourceViewerConfigura
IToken bugToken = new Token(new TextAttribute(JFaceResources.getColorRegistry().get(
JFacePreferences.ACTIVE_HYPERLINK_COLOR)));
IToken quoteToken = new Token(new TextAttribute(CommonColors.TEXT_QUOTED));
- IRule[] rules = new IRule[16];
+ IRule[] rules = new IRule[8];
rules[0] = (new SingleLineRule("http://", " ", bugToken)); //$NON-NLS-1$ //$NON-NLS-2$
rules[1] = (new SingleLineRule("https://", " ", bugToken)); //$NON-NLS-1$ //$NON-NLS-2$
- rules[2] = (new SingleLineRule("bug#", " ", bugToken)); //$NON-NLS-1$ //$NON-NLS-2$
- rules[3] = (new SingleLineRule("bug#", "", bugToken)); //$NON-NLS-1$ //$NON-NLS-2$
- rules[4] = (new SingleLineRule("bug #", "", bugToken)); //$NON-NLS-1$ //$NON-NLS-2$
- rules[5] = (new SingleLineRule("http://", "\n", bugToken)); //$NON-NLS-1$ //$NON-NLS-2$
- rules[6] = (new SingleLineRule("https://", "\n", bugToken)); //$NON-NLS-1$ //$NON-NLS-2$
- rules[7] = (new SingleLineRule("task#", " ", bugToken)); //$NON-NLS-1$ //$NON-NLS-2$
- rules[8] = (new MultiLineRule("task#", "\n", bugToken)); //$NON-NLS-1$ //$NON-NLS-2$
- rules[9] = (new MultiLineRule("task# ", " ", bugToken)); //$NON-NLS-1$ //$NON-NLS-2$
- rules[10] = (new SingleLineRule("task #", "\n", bugToken)); //$NON-NLS-1$ //$NON-NLS-2$
- rules[11] = (new SingleLineRule("*** This bug has been ", "***", bugToken)); //$NON-NLS-1$ //$NON-NLS-2$
- rules[12] = (new SingleLineRule("http://", "", bugToken)); //$NON-NLS-1$ //$NON-NLS-2$
- rules[13] = (new SingleLineRule("https://", "", bugToken)); //$NON-NLS-1$ //$NON-NLS-2$
- rules[14] = (new MultiLineRule("task #", " ", bugToken)); //$NON-NLS-1$ //$NON-NLS-2$
+ rules[2] = (new SingleLineRule("http://", "\n", bugToken)); //$NON-NLS-1$ //$NON-NLS-2$
+ rules[3] = (new SingleLineRule("https://", "\n", bugToken)); //$NON-NLS-1$ //$NON-NLS-2$
+ rules[4] = (new SingleLineRule("*** This bug has been ", "***", bugToken)); //$NON-NLS-1$ //$NON-NLS-2$
+ rules[5] = (new SingleLineRule("http://", "", bugToken, '\\', true)); //$NON-NLS-1$ //$NON-NLS-2$
+ rules[6] = (new SingleLineRule("https://", "", bugToken, '\\', true)); //$NON-NLS-1$ //$NON-NLS-2$
SingleLineRule quoteRule = new SingleLineRule(">", null, quoteToken, (char) 0, true); //$NON-NLS-1$
quoteRule.setColumnConstraint(0);
- rules[15] = quoteRule;
+ rules[7] = quoteRule;
setRules(rules);
}
-
}
@Override

Back to the top