mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-07-30 04:15:35 +02:00
Code Issues Wiki Activity

Cosmetic changes and long time fixes for the Makefile editore.

Browse source
This commit is contained in:
Alain Magloire 2008-03-28 15:43:03 +00:00
parent 802af6b09c
commit 15447a0c0b
4 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/editor/MakefileDocumentSetupParticipant.java
View file

@ -20,7 +20,7 @@ import org.eclipse.jface.text.rules.FastPartitioner;
/** /**
* MakefileDocumentSetupParticipant * MakefileDocumentSetupParticipant
* The document setup participant for Ant. * The document setup participant for Makefile.
*/ */
public class MakefileDocumentSetupParticipant implements IDocumentSetupParticipant { public class MakefileDocumentSetupParticipant implements IDocumentSetupParticipant {

2
build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/text/makefile/MacroDefinitionRule.java
View file

@ -95,7 +95,7 @@ class MacroDefinitionRule implements IPredicateRule {
scanner.unread(); scanner.unread();
if (state == FINISH_STATE) { if (state == FINISH_STATE) {
scanToEndOfLine(scanner); //scanToEndOfLine(scanner);
return token; return token;
} }

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

@ -78,7 +78,8 @@ public class MakefileCodeScanner extends AbstractMakefileCodeScanner {
MultiLineRule defineRule = new MultiLineRule("define", "endef", macroDef); //$NON-NLS-1$ //$NON-NLS-2$ MultiLineRule defineRule = new MultiLineRule("define", "endef", macroDef); //$NON-NLS-1$ //$NON-NLS-2$
defineRule.setColumnConstraint(0); defineRule.setColumnConstraint(0);
rules.add(defineRule); rules.add(defineRule);
rules.add(new MacroDefinitionRule(macroDef, other));
// rules.add(new MacroDefinitionRule(macroDef, other));
// Add word rule for keywords, types, and constants. // Add word rule for keywords, types, and constants.
// We restring the detection of the keywords to be the first column to be valid. // We restring the detection of the keywords to be the first column to be valid.

5
build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/text/makefile/MakefileWordDetector.java
View file

@ -14,8 +14,9 @@ import org.eclipse.jface.text.rules.IWordDetector;
public class MakefileWordDetector implements IWordDetector { public class MakefileWordDetector implements IWordDetector {
private static final String correctStartSpecChars = "%*().><"; //$NON-NLS-1$ //private static final String correctStartSpecChars = "%*().><"; //$NON-NLS-1$
private static final String correctSpecChars = "@$/\\"; //$NON-NLS-1$ private static final String correctStartSpecChars = "%*()><"; //$NON-NLS-1$
private static final String correctSpecChars = "@$/\\_"; //$NON-NLS-1$
/** /**
* @see IWordDetector#isWordPart(character) * @see IWordDetector#isWordPart(character)