mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-04-29 19:45:01 +02:00
Code Issues Wiki Activity

Bug 412457: Makefile Editor does not highlight built-in functions enclosed in curly braces ${...}

Browse source
This commit is contained in:
Andrew Gvozdev 2013-07-07 09:51:29 -04:00
parent d38367d676
commit 1df606bb26
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/text/makefile/FunctionReferenceRule.java
View file

@ -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();
}