mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-06-05 16:56:04 +02:00
Code Issues Wiki Activity

Bug 260261 - Makefile syntax highlighting error on comments at multiple lines

Browse source
This commit is contained in:
Anton Leherbauer 2009-01-15 13:35:25 +00:00
parent a3c36bd408
commit 31e004f8cb
4 changed files with 77 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

84
build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/editor/MakefileSourceConfiguration.java
View file

@ -1,5 +1,5 @@
/*******************************************************************************
* Copyright (c) 2000, 2007 QNX Software Systems and others.
* Copyright (c) 2000, 2008 QNX Software Systems and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@ -11,7 +11,10 @@
*******************************************************************************/
package org.eclipse.cdt.make.internal.ui.editor;
import java.util.List;
import org.eclipse.cdt.make.internal.ui.text.ColorManager;
import org.eclipse.cdt.make.internal.ui.text.makefile.AbstractMakefileCodeScanner;
import org.eclipse.cdt.make.internal.ui.text.makefile.MakefileAnnotationHover;
import org.eclipse.cdt.make.internal.ui.text.makefile.MakefileCodeScanner;
import org.eclipse.cdt.make.internal.ui.text.makefile.MakefileCompletionProcessor;
@ -22,16 +25,14 @@ import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.jface.preference.IPreferenceStore;
import org.eclipse.jface.text.IDocument;
import org.eclipse.jface.text.ITextHover;
import org.eclipse.jface.text.TextAttribute;
import org.eclipse.jface.text.contentassist.ContentAssistant;
import org.eclipse.jface.text.contentassist.IContentAssistant;
import org.eclipse.jface.text.presentation.IPresentationReconciler;
import org.eclipse.jface.text.presentation.PresentationReconciler;
import org.eclipse.jface.text.reconciler.IReconciler;
import org.eclipse.jface.text.reconciler.MonoReconciler;
import org.eclipse.jface.text.rules.BufferedRuleBasedScanner;
import org.eclipse.jface.text.rules.DefaultDamagerRepairer;
import org.eclipse.jface.text.rules.Token;
import org.eclipse.jface.text.rules.ITokenScanner;
import org.eclipse.jface.text.source.IAnnotationHover;
import org.eclipse.jface.text.source.ISourceViewer;
import org.eclipse.jface.text.source.SourceViewerConfiguration;
@ -41,16 +42,35 @@ import org.eclipse.ui.editors.text.TextSourceViewerConfiguration;
public class MakefileSourceConfiguration extends TextSourceViewerConfiguration {
private ColorManager colorManager;
MakefileCodeScanner codeScanner;
private ColorManager fColorManager;
MakefileCodeScanner fCodeScanner;
private MakefileEditor fEditor;
private SingleTokenScanner fCommentScanner;
/**
* Single token scanner.
*/
static class SingleTokenScanner extends BufferedRuleBasedScanner {
public SingleTokenScanner(TextAttribute attribute) {
setDefaultReturnToken(new Token(attribute));
static class SingleTokenScanner extends AbstractMakefileCodeScanner {
private final String[] fProperties;
public SingleTokenScanner(String property) {
fProperties= new String[] { property };
initialize();
}
/*
* @see org.eclipse.cdt.make.internal.ui.text.makefile.AbstractMakefileCodeScanner#createRules()
*/
protected List createRules() {
setDefaultReturnToken(getToken(fProperties[0]));
return null;
}
/*
* @see org.eclipse.cdt.make.internal.ui.text.makefile.AbstractMakefileCodeScanner#getTokenProperties()
*/
protected String[] getTokenProperties() {
return fProperties;
}
}
@ -60,7 +80,7 @@ public class MakefileSourceConfiguration extends TextSourceViewerConfiguration {
public MakefileSourceConfiguration(IPreferenceStore preferenceStore, MakefileEditor editor) {
super(preferenceStore);
fEditor = editor;
colorManager = ColorManager.getDefault();
fColorManager = ColorManager.getDefault();
}
/**
@ -84,6 +104,7 @@ public class MakefileSourceConfiguration extends TextSourceViewerConfiguration {
public IContentAssistant getContentAssistant(ISourceViewer sourceViewer) {
if (fEditor != null && fEditor.isEditable()) {
ContentAssistant assistant = new ContentAssistant();
assistant.setDocumentPartitioning(getConfiguredDocumentPartitioning(sourceViewer));
assistant.setContentAssistProcessor(new MakefileCompletionProcessor(fEditor), IDocument.DEFAULT_CONTENT_TYPE);
assistant.setContentAssistProcessor(new MakefileCompletionProcessor(fEditor), MakefilePartitionScanner.MAKEFILE_COMMENT_PARTITION);
assistant.setContentAssistProcessor(new MakefileCompletionProcessor(fEditor), MakefilePartitionScanner.MAKEFILE_DEF_BLOCK_PARTITION);
@ -97,7 +118,7 @@ public class MakefileSourceConfiguration extends TextSourceViewerConfiguration {
assistant.setProposalPopupOrientation(IContentAssistant.CONTEXT_INFO_BELOW);
assistant.setContextInformationPopupOrientation(IContentAssistant.CONTEXT_INFO_BELOW);
//Set to Carolina blue
assistant.setContextInformationPopupBackground(colorManager.getColor(new RGB(0, 191, 255)));
assistant.setContextInformationPopupBackground(fColorManager.getColor(new RGB(0, 191, 255)));
return assistant;
}
@ -105,22 +126,27 @@ public class MakefileSourceConfiguration extends TextSourceViewerConfiguration {
}
protected MakefileCodeScanner getCodeScanner() {
if (null == codeScanner)
codeScanner = new MakefileCodeScanner();
return codeScanner;
if (null == fCodeScanner)
fCodeScanner = new MakefileCodeScanner();
return fCodeScanner;
}
protected ITokenScanner getCommentScanner() {
if (null == fCommentScanner)
fCommentScanner = new SingleTokenScanner(ColorManager.MAKE_COMMENT_COLOR);
return fCommentScanner;
}
public IPresentationReconciler getPresentationReconciler(ISourceViewer v) {
PresentationReconciler reconciler = new PresentationReconciler();
reconciler.setDocumentPartitioning(getConfiguredDocumentPartitioning(v));
DefaultDamagerRepairer dr = new DefaultDamagerRepairer(getCodeScanner());
reconciler.setDamager(dr, IDocument.DEFAULT_CONTENT_TYPE);
reconciler.setRepairer(dr, IDocument.DEFAULT_CONTENT_TYPE);
dr = new DefaultDamagerRepairer(getCodeScanner());
dr = new DefaultDamagerRepairer(getCodeScanner());
dr = new DefaultDamagerRepairer(getCommentScanner());
reconciler.setDamager(dr, MakefilePartitionScanner.MAKEFILE_COMMENT_PARTITION);
reconciler.setRepairer(dr, MakefilePartitionScanner.MAKEFILE_COMMENT_PARTITION);
@ -146,6 +172,13 @@ public class MakefileSourceConfiguration extends TextSourceViewerConfiguration {
return reconciler;
}
/*
* @see org.eclipse.jface.text.source.SourceViewerConfiguration#getConfiguredDocumentPartitioning(org.eclipse.jface.text.source.ISourceViewer)
*/
public String getConfiguredDocumentPartitioning(ISourceViewer sourceViewer) {
return MakefileDocumentSetupParticipant.MAKEFILE_PARTITIONING;
}
/**
* @see SourceViewerConfiguration#getReconciler(ISourceViewer)
*/
@ -190,16 +223,25 @@ public class MakefileSourceConfiguration extends TextSourceViewerConfiguration {
* @return
*/
public boolean affectsBehavior(PropertyChangeEvent event) {
MakefileCodeScanner scanner = getCodeScanner();
return scanner.affectsBehavior(event);
if (fCodeScanner != null && fCodeScanner.affectsBehavior(event)) {
return true;
}
if (fCommentScanner != null && fCommentScanner.affectsBehavior(event)) {
return true;
}
return false;
}
/**
* @param event
*/
public void adaptToPreferenceChange(PropertyChangeEvent event) {
MakefileCodeScanner scanner = getCodeScanner();
scanner.adaptToPreferenceChange(event);
if (fCodeScanner != null) {
fCodeScanner.adaptToPreferenceChange(event);
}
if (fCommentScanner != null) {
fCommentScanner.adaptToPreferenceChange(event);
}
}
}

18
build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/text/makefile/AbstractMakefileCodeScanner.java
View file

@ -1,5 +1,5 @@
/*******************************************************************************
* Copyright (c) 2002, 2006 QNX Software Systems and others.
* Copyright (c) 2002, 2008 QNX Software Systems and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@ -113,13 +113,15 @@ public abstract class AbstractMakefileCodeScanner extends RuleBasedScanner {
public void adaptToPreferenceChange(PropertyChangeEvent event) {
String p= event.getProperty();
int index= indexOf(p);
Token token= getToken(fPropertyNamesColor[index]);
if (fPropertyNamesColor[index].equals(p))
adaptToColorChange(event, token);
else if (fPropertyNamesBold[index].equals(p))
adaptToStyleChange(event, token, SWT.BOLD);
else if (fPropertyNamesItalic[index].equals(p))
adaptToStyleChange(event, token, SWT.ITALIC);
if (index >= 0) {
Token token= getToken(fPropertyNamesColor[index]);
if (fPropertyNamesColor[index].equals(p))
adaptToColorChange(event, token);
else if (fPropertyNamesBold[index].equals(p))
adaptToStyleChange(event, token, SWT.BOLD);
else if (fPropertyNamesItalic[index].equals(p))
adaptToStyleChange(event, token, SWT.ITALIC);
}
}
protected void adaptToColorChange(PropertyChangeEvent event, Token token) {

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

@ -1,5 +1,5 @@
/*******************************************************************************
* Copyright (c) 2000, 2006 QNX Software Systems and others.
* Copyright (c) 2000, 2008 QNX Software Systems and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@ -14,7 +14,6 @@ import java.util.ArrayList;
import java.util.List;
import org.eclipse.cdt.make.internal.ui.text.ColorManager;
import org.eclipse.jface.text.rules.EndOfLineRule;
import org.eclipse.jface.text.rules.IToken;
import org.eclipse.jface.text.rules.IWhitespaceDetector;
import org.eclipse.jface.text.rules.MultiLineRule;
@ -25,7 +24,7 @@ public class MakefileCodeScanner extends AbstractMakefileCodeScanner {
private final static String[] keywords = { "define", "endef", "ifdef", "ifndef", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
"ifeq", "ifneq", "else", "endif", "include", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$
"-include", "sinclude", "override", "endef", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
"-include", "sinclude", "override", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
"export", "unexport", "vpath" //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
};
@ -38,7 +37,6 @@ public class MakefileCodeScanner extends AbstractMakefileCodeScanner {
};
public static final String[] fTokenProperties = new String[] {
ColorManager.MAKE_COMMENT_COLOR,
ColorManager.MAKE_KEYWORD_COLOR,
ColorManager.MAKE_FUNCTION_COLOR,
ColorManager.MAKE_MACRO_REF_COLOR,
@ -57,22 +55,18 @@ public class MakefileCodeScanner extends AbstractMakefileCodeScanner {
protected List createRules() {
IToken keyword = getToken(ColorManager.MAKE_KEYWORD_COLOR);
IToken function = getToken(ColorManager.MAKE_FUNCTION_COLOR);
IToken comment = getToken(ColorManager.MAKE_COMMENT_COLOR);
IToken macroRef = getToken(ColorManager.MAKE_MACRO_REF_COLOR);
IToken macroDef = getToken(ColorManager.MAKE_MACRO_DEF_COLOR);
IToken other = getToken(ColorManager.MAKE_DEFAULT_COLOR);
List rules = new ArrayList();
// Add rule for single line comments.
rules.add(new EndOfLineRule("#", comment, '\\', true)); //$NON-NLS-1$
// Add generic whitespace rule.
rules.add(new WhitespaceRule(new IWhitespaceDetector() {
public boolean isWhitespace(char character) {
return Character.isWhitespace(character);
}
}));
}, other));
// Put before the the word rules
MultiLineRule defineRule = new MultiLineRule("define", "endef", macroDef); //$NON-NLS-1$ //$NON-NLS-2$

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

@ -70,7 +70,7 @@ public class MakefilePartitionScanner extends RuleBasedPartitionScanner {
rules.add(new MultiLineRule("define", "endef", tDef)); //$NON-NLS-1$ //$NON-NLS-2$
rules.add(new MultiLineRule("override define", "endef", tDef)); //$NON-NLS-1$ //$NON-NLS-2$
// Add rules for multi-line comments and javadoc.
// Add rules for conditionals
rules.add(new MultiLineRule("ifdef", "endif", tIf)); //$NON-NLS-1$ //$NON-NLS-2$
rules.add(new MultiLineRule("ifndef", "endif", tIf)); //$NON-NLS-1$ //$NON-NLS-2$
rules.add(new MultiLineRule("ifeq", "endif", tIf)); //$NON-NLS-1$ //$NON-NLS-2$