diff options
author | Andrew Gvozdev | 2013-07-07 13:51:29 +0000 |
---|---|---|
committer | Andrew Gvozdev | 2013-07-07 13:51:29 +0000 |
commit | 1df606bb26322b5ac3b68a5c97f022964d22e3ac (patch) | |
tree | 82791d178f4be940780c26fee6a791e43a72de67 /build/org.eclipse.cdt.make.ui | |
parent | d38367d6765b0e4e40331a493bff1a95a6c35ba6 (diff) | |
download | org.eclipse.cdt-1df606bb26322b5ac3b68a5c97f022964d22e3ac.tar.gz org.eclipse.cdt-1df606bb26322b5ac3b68a5c97f022964d22e3ac.tar.xz org.eclipse.cdt-1df606bb26322b5ac3b68a5c97f022964d22e3ac.zip |
Bug 412457: Makefile Editor does not highlight built-in functions enclosed in curly braces ${...}
Diffstat (limited to 'build/org.eclipse.cdt.make.ui')
-rw-r--r-- | build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/text/makefile/FunctionReferenceRule.java | 9 |
1 files changed, 6 insertions, 3 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 9b291e1316d..f2f49c5676c 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 @@ -60,6 +60,9 @@ public class FunctionReferenceRule extends WordRule { public boolean isWordPart(char c) { return !isClosedBracket && (c == '$' || c == openBracket || Character.isJavaIdentifierPart(c) || c == '-'); } + public boolean isBracket(char c) { + return "(){}".contains(Character.toString(c)); //$NON-NLS-1$ + } } public FunctionReferenceRule(IToken token, String startSeq, String endSeq) { @@ -76,7 +79,7 @@ public class FunctionReferenceRule extends WordRule { @Override public IToken evaluate(ICharacterScanner scanner) { TagDetector tagDetector = (TagDetector)fDetector; - int c= scanner.read(); + int c = scanner.read(); if (c == tagDetector.closedBracket) { if (tagDetector.bracketNesting > 0) { tagDetector.bracketNesting--; @@ -91,7 +94,7 @@ public class FunctionReferenceRule extends WordRule { fBuffer.setLength(0); do { fBuffer.append((char) c); - c= scanner.read(); + c = scanner.read(); } while (c != ICharacterScanner.EOF && fDetector.isWordPart((char) c)); scanner.unread(); @@ -104,7 +107,7 @@ public class FunctionReferenceRule extends WordRule { if ((char)scanner.read() == ' ') { do { c = scanner.read(); - } while (c == tagDetector.openBracket || c == tagDetector.closedBracket || fDetector.isWordPart((char) c)); + } while (((TagDetector) fDetector).isBracket((char)c) || fDetector.isWordPart((char) c)); } scanner.unread(); } |