mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-06-09 18:56:02 +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 08:06:45 -04:00
parent cb5b5c955a
commit d38367d676
2 changed files with 35 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -10,6 +10,7 @@
*******************************************************************************/ *******************************************************************************/
package org.eclipse.cdt.make.internal.ui.text.makefile; package org.eclipse.cdt.make.internal.ui.text.makefile;
import org.eclipse.cdt.make.internal.core.makefile.gnu.GNUMakefileConstants;
import org.eclipse.jface.text.rules.ICharacterScanner; import org.eclipse.jface.text.rules.ICharacterScanner;
import org.eclipse.jface.text.rules.IToken; import org.eclipse.jface.text.rules.IToken;
import org.eclipse.jface.text.rules.IWordDetector; import org.eclipse.jface.text.rules.IWordDetector;
@ -19,6 +20,8 @@ import org.eclipse.jface.text.rules.WordRule;
public class FunctionReferenceRule extends WordRule { public class FunctionReferenceRule extends WordRule {
/** Buffer used for pattern detection. */ /** Buffer used for pattern detection. */
private StringBuffer fBuffer= new StringBuffer(); private StringBuffer fBuffer= new StringBuffer();
private String startSeq;
private String endSeq;
@SuppressWarnings("nls") @SuppressWarnings("nls")
private final static String[] functions = { private final static String[] functions = {
@ -33,36 +36,51 @@ public class FunctionReferenceRule extends WordRule {
"shell", "error", "warning", "info", "shell", "error", "warning", "info",
}; };
static class TagDetector implements IWordDetector { private static class TagDetector implements IWordDetector {
private char openBracket;
private char closedBracket;
private boolean isClosedBracket = false; private boolean isClosedBracket = false;
private int bracketNesting = 0; private int bracketNesting = 0;
public TagDetector(String endSeq) {
if (endSeq.length() > 0 && endSeq.charAt(0) == '}') {
openBracket = '{';
closedBracket = '}';
} else {
openBracket = '(';
closedBracket = ')';
}
}
@Override @Override
public boolean isWordStart(char c) { public boolean isWordStart(char c) {
isClosedBracket = c == ')'; isClosedBracket = c == closedBracket;
return isClosedBracket || c == '$'; return isClosedBracket || c == '$';
} }
@Override @Override
public boolean isWordPart(char c) { public boolean isWordPart(char c) {
return !isClosedBracket && (c == '$' || c == '(' || Character.isJavaIdentifierPart(c) || c == '-'); return !isClosedBracket && (c == '$' || c == openBracket || Character.isJavaIdentifierPart(c) || c == '-');
} }
} }
public FunctionReferenceRule(IToken token) { public FunctionReferenceRule(IToken token, String startSeq, String endSeq) {
super(new TagDetector()); super(new TagDetector(endSeq));
this.startSeq = startSeq;
this.endSeq = endSeq;
for (String f : functions) { for (String f : functions) {
addWord("$(" + f, token); //$NON-NLS-1$ addWord(startSeq + f, token);
addWord("$$(" + f, token); //$NON-NLS-1$ addWord('$' + startSeq + f, token);
} }
addWord(")", token); //$NON-NLS-1$ addWord(endSeq, token);
} }
@Override @Override
public IToken evaluate(ICharacterScanner scanner) { public IToken evaluate(ICharacterScanner scanner) {
TagDetector tagDetector = (TagDetector)fDetector;
int c= scanner.read(); int c= scanner.read();
if (c == ')') { if (c == tagDetector.closedBracket) {
if (((TagDetector)fDetector).bracketNesting > 0) { if (tagDetector.bracketNesting > 0) {
((TagDetector)fDetector).bracketNesting--; tagDetector.bracketNesting--;
return (IToken)fWords.get(")"); //$NON-NLS-1$ return (IToken)fWords.get(endSeq);
} }
return fDefaultToken; return fDefaultToken;
} }
@ -82,11 +100,11 @@ public class FunctionReferenceRule extends WordRule {
IToken token= (IToken)fWords.get(buffer); IToken token= (IToken)fWords.get(buffer);
if (token != null) { if (token != null) {
if (buffer.equals("$(call") || buffer.equals("$$(call")) { if (buffer.equals(startSeq + GNUMakefileConstants.FUNCTION_CALL) || buffer.equals('$' + startSeq + GNUMakefileConstants.FUNCTION_CALL)) {
if ((char)scanner.read() == ' ') { if ((char)scanner.read() == ' ') {
do { do {
c= scanner.read(); c = scanner.read();
} while (c == '(' || c == ')' || fDetector.isWordPart((char) c)); } while (c == tagDetector.openBracket || c == tagDetector.closedBracket || fDetector.isWordPart((char) c));
} }
scanner.unread(); scanner.unread();
} }

3
build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/text/makefile/MakefileCodeScanner.java
View file

@ -111,7 +111,8 @@ public class MakefileCodeScanner extends AbstractMakefileCodeScanner {
} }
rules.add(keyWordRule); rules.add(keyWordRule);
rules.add(new FunctionReferenceRule(functionToken)); rules.add(new FunctionReferenceRule(functionToken, "$(", ")")); //$NON-NLS-1$ //$NON-NLS-2$
rules.add(new FunctionReferenceRule(functionToken, "${", "}")); //$NON-NLS-1$ //$NON-NLS-2$
rules.add(new AutomaticVariableReferenceRule(macroRefToken)); 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$