diff options
| author | Alain Magloire | 2008-03-28 15:43:03 +0000 |
|---|---|---|
| committer | Alain Magloire | 2008-03-28 15:43:03 +0000 |
| commit | 15447a0c0bafecfcbc2038502c4f0e2bfd9da7e1 (patch) | |
| tree | 1ada2a865cb7a08e32f54bd494f4ad4613f57ce8 /build/org.eclipse.cdt.make.ui | |
| parent | 802af6b09cae2e216d33e3bfde910d2a24088652 (diff) | |
| download | org.eclipse.cdt-15447a0c0bafecfcbc2038502c4f0e2bfd9da7e1.tar.gz org.eclipse.cdt-15447a0c0bafecfcbc2038502c4f0e2bfd9da7e1.tar.xz org.eclipse.cdt-15447a0c0bafecfcbc2038502c4f0e2bfd9da7e1.zip | |
Cosmetic changes and long time fixes for the Makefile editore.
Diffstat (limited to 'build/org.eclipse.cdt.make.ui')
4 files changed, 7 insertions, 5 deletions
diff --git a/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/editor/MakefileDocumentSetupParticipant.java b/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/editor/MakefileDocumentSetupParticipant.java index 3824e8f921b..4bd6745bf0d 100644 --- a/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/editor/MakefileDocumentSetupParticipant.java +++ b/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/editor/MakefileDocumentSetupParticipant.java @@ -20,7 +20,7 @@ import org.eclipse.jface.text.rules.FastPartitioner; /** * MakefileDocumentSetupParticipant - * The document setup participant for Ant. + * The document setup participant for Makefile. */ public class MakefileDocumentSetupParticipant implements IDocumentSetupParticipant { diff --git a/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/text/makefile/MacroDefinitionRule.java b/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/text/makefile/MacroDefinitionRule.java index a59af52c31a..928bae15b48 100644 --- a/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/text/makefile/MacroDefinitionRule.java +++ b/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/text/makefile/MacroDefinitionRule.java @@ -95,7 +95,7 @@ class MacroDefinitionRule implements IPredicateRule { scanner.unread(); if (state == FINISH_STATE) { - scanToEndOfLine(scanner); + //scanToEndOfLine(scanner); return token; } 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 0763dae72e9..f073880e5ae 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 @@ -78,7 +78,8 @@ public class MakefileCodeScanner extends AbstractMakefileCodeScanner { MultiLineRule defineRule = new MultiLineRule("define", "endef", macroDef); //$NON-NLS-1$ //$NON-NLS-2$ defineRule.setColumnConstraint(0); rules.add(defineRule); - rules.add(new MacroDefinitionRule(macroDef, other)); + +// rules.add(new MacroDefinitionRule(macroDef, other)); // Add word rule for keywords, types, and constants. // We restring the detection of the keywords to be the first column to be valid. diff --git a/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/text/makefile/MakefileWordDetector.java b/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/text/makefile/MakefileWordDetector.java index d255dc1368f..a648a9b1ec7 100644 --- a/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/text/makefile/MakefileWordDetector.java +++ b/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/text/makefile/MakefileWordDetector.java @@ -14,8 +14,9 @@ import org.eclipse.jface.text.rules.IWordDetector; public class MakefileWordDetector implements IWordDetector { - 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 correctStartSpecChars = "%*()><"; //$NON-NLS-1$ + private static final String correctSpecChars = "@$/\\_"; //$NON-NLS-1$ /** * @see IWordDetector#isWordPart(character) |