diff options
| author | Andrew Gvozdev | 2013-05-03 14:33:04 +0000 |
|---|---|---|
| committer | Andrew Gvozdev | 2013-05-03 15:02:33 +0000 |
| commit | 566130590d7009a0df5e4f4e80e76f999cfd4f9d (patch) | |
| tree | b0f4fa90d38ea51007bb7eab09da4372be247bdd /build | |
| parent | 5f19186a605c3f17878217059098f13c6a109c41 (diff) | |
| download | org.eclipse.cdt-566130590d7009a0df5e4f4e80e76f999cfd4f9d.tar.gz org.eclipse.cdt-566130590d7009a0df5e4f4e80e76f999cfd4f9d.tar.xz org.eclipse.cdt-566130590d7009a0df5e4f4e80e76f999cfd4f9d.zip | |
bug 406911: Highlight $$(...) same as $(...) for meaningful highlight inside define/endef in Makefile Editor
Diffstat (limited to 'build')
2 files changed, 4 insertions, 1 deletions
diff --git a/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/text/makefile/FunctionReferenceRule.java b/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/text/makefile/FunctionReferenceRule.java index 7902bddb13c..42406558b65 100644 --- a/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/text/makefile/FunctionReferenceRule.java +++ b/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/text/makefile/FunctionReferenceRule.java @@ -43,7 +43,7 @@ public class FunctionReferenceRule extends WordRule { } @Override public boolean isWordPart(char c) { - return !isClosedBracket && (c == '(' || Character.isJavaIdentifierPart(c) || c == '-'); + return !isClosedBracket && (c == '$' || c == '(' || Character.isJavaIdentifierPart(c) || c == '-'); } } @@ -51,6 +51,7 @@ public class FunctionReferenceRule extends WordRule { super(new TagDetector()); for (String f : functions) { addWord("$(" + f, token); //$NON-NLS-1$ + addWord("$$(" + f, token); //$NON-NLS-1$ } addWord(")", token); //$NON-NLS-1$ } diff --git a/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/text/makefile/MakefileCodeScanner.java b/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/text/makefile/MakefileCodeScanner.java index be098f2b579..23cde9afea4 100644 --- a/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/text/makefile/MakefileCodeScanner.java +++ b/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/text/makefile/MakefileCodeScanner.java @@ -95,7 +95,9 @@ public class MakefileCodeScanner extends AbstractMakefileCodeScanner { rules.add(new AutomaticVariableReferenceRule(macroRefToken)); rules.add(new MacroReferenceRule(macroRefToken, "$(", ")")); //$NON-NLS-1$ //$NON-NLS-2$ + rules.add(new MacroReferenceRule(macroRefToken, "$$(", ")")); //$NON-NLS-1$ //$NON-NLS-2$ rules.add(new MacroReferenceRule(macroRefToken, "${", "}")); //$NON-NLS-1$ //$NON-NLS-2$ + rules.add(new MacroReferenceRule(macroRefToken, "$${", "}")); //$NON-NLS-1$ //$NON-NLS-2$ setDefaultReturnToken(defaultToken); |