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

Improve macro highlighting

Browse source
This commit is contained in:
Anton Leherbauer 2008-01-15 09:46:52 +00:00
parent b127b4265f
commit c18ff521d9
1 changed files with 27 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

51
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/SemanticHighlightingReconciler.java
View file

@ -1,5 +1,5 @@
/******************************************************************************* /*******************************************************************************
* Copyright (c) 2000, 2007 IBM Corporation and others. * Copyright (c) 2000, 2008 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials * All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0 * are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at * which accompanies this distribution, and is available at
@ -33,6 +33,7 @@ import org.eclipse.cdt.core.dom.ast.IASTDeclSpecifier;
import org.eclipse.cdt.core.dom.ast.IASTDeclaration; import org.eclipse.cdt.core.dom.ast.IASTDeclaration;
import org.eclipse.cdt.core.dom.ast.IASTDeclarator; import org.eclipse.cdt.core.dom.ast.IASTDeclarator;
import org.eclipse.cdt.core.dom.ast.IASTExpression; import org.eclipse.cdt.core.dom.ast.IASTExpression;
import org.eclipse.cdt.core.dom.ast.IASTFileLocation;
import org.eclipse.cdt.core.dom.ast.IASTFunctionDefinition; import org.eclipse.cdt.core.dom.ast.IASTFunctionDefinition;
import org.eclipse.cdt.core.dom.ast.IASTImageLocation; import org.eclipse.cdt.core.dom.ast.IASTImageLocation;
import org.eclipse.cdt.core.dom.ast.IASTInitializer; import org.eclipse.cdt.core.dom.ast.IASTInitializer;
@ -75,7 +76,7 @@ public class SemanticHighlightingReconciler implements ICReconcilingListener {
/** /**
* AST visitor to test whether a node is a leaf node. * AST visitor to test whether a node is a leaf node.
*/ */
public static final class LeafNodeTester extends CPPASTVisitor { public static final class ChildNodeFinder extends CPPASTVisitor {
{ {
shouldVisitNames= true; shouldVisitNames= true;
shouldVisitDeclarations= true; shouldVisitDeclarations= true;
@ -95,10 +96,16 @@ public class SemanticHighlightingReconciler implements ICReconcilingListener {
shouldVisitTemplateParameters= true; shouldVisitTemplateParameters= true;
} }
private int fVisits; private int fVisits;
private int fFirstChildOffset;
private int processNode(IASTNode node) { private int processNode(IASTNode node) {
if (++fVisits > 1) if (++fVisits > 1) {
final IASTFileLocation fileLocation = node.getFileLocation();
if (fileLocation != null) {
fFirstChildOffset= fileLocation.getNodeOffset();
return PROCESS_ABORT; return PROCESS_ABORT;
}
}
return PROCESS_CONTINUE; return PROCESS_CONTINUE;
} }
public int visit(ICPPASTBaseSpecifier specifier) { public int visit(ICPPASTBaseSpecifier specifier) {
@ -146,10 +153,11 @@ public class SemanticHighlightingReconciler implements ICReconcilingListener {
public int visit(IASTTypeId typeId) { public int visit(IASTTypeId typeId) {
return processNode(typeId); return processNode(typeId);
} }
public boolean isLeafNode(IASTNode node) { public int getFirstChildOffset(IASTNode node) {
fVisits= 0; fVisits= 0;
fFirstChildOffset= Integer.MAX_VALUE;
node.accept(this); node.accept(this);
return fVisits <= 1; return fFirstChildOffset;
} }
} }
@ -157,7 +165,6 @@ public class SemanticHighlightingReconciler implements ICReconcilingListener {
* Collects positions from the AST. * Collects positions from the AST.
*/ */
private class PositionCollector extends CPPASTVisitor { private class PositionCollector extends CPPASTVisitor {
{ {
shouldVisitTranslationUnit= true; shouldVisitTranslationUnit= true;
shouldVisitNames= true; shouldVisitNames= true;
@ -174,13 +181,9 @@ public class SemanticHighlightingReconciler implements ICReconcilingListener {
private SemanticToken fToken= new SemanticToken(); private SemanticToken fToken= new SemanticToken();
private String fFilePath; private String fFilePath;
private int fMinLocation; private int fMinLocation;
private final LeafNodeTester fgLeafNodeTester= new LeafNodeTester(); private final ChildNodeFinder fgChildNodeFinder= new ChildNodeFinder();
/** public PositionCollector() {
* @param filePath
*/
public PositionCollector(String filePath) {
fFilePath= filePath;
fMinLocation= -1; fMinLocation= -1;
} }
@ -188,11 +191,13 @@ public class SemanticHighlightingReconciler implements ICReconcilingListener {
* @see org.eclipse.cdt.core.dom.ast.ASTVisitor#visit(org.eclipse.cdt.core.dom.ast.IASTTranslationUnit) * @see org.eclipse.cdt.core.dom.ast.ASTVisitor#visit(org.eclipse.cdt.core.dom.ast.IASTTranslationUnit)
*/ */
public int visit(IASTTranslationUnit tu) { public int visit(IASTTranslationUnit tu) {
fFilePath= tu.getFilePath();
// visit macro definitions // visit macro definitions
IASTPreprocessorMacroDefinition[] macroDefs= tu.getMacroDefinitions(); IASTPreprocessorMacroDefinition[] macroDefs= tu.getMacroDefinitions();
for (int i= 0; i < macroDefs.length; i++) { for (int i= 0; i < macroDefs.length; i++) {
IASTPreprocessorMacroDefinition macroDef= macroDefs[i]; IASTPreprocessorMacroDefinition macroDef= macroDefs[i];
if (fFilePath.equals(macroDef.getContainingFilename())) { if (macroDef.isPartOfTranslationUnitFile()) {
visitNode(macroDef.getName()); visitNode(macroDef.getName());
} }
} }
@ -200,7 +205,7 @@ public class SemanticHighlightingReconciler implements ICReconcilingListener {
// IASTName[] macroExps= tu.getMacroExpansions(); // IASTName[] macroExps= tu.getMacroExpansions();
// for (int i= 0; i < macroExps.length; i++) { // for (int i= 0; i < macroExps.length; i++) {
// IASTName macroExp= macroExps[i]; // IASTName macroExp= macroExps[i];
// if (fFilePath.equals(macroExp.getContainingFilename())) { // if (macroExp.isPartOfTranslationUnitFile()) {
// visitMacroExpansion(macroExp); // visitMacroExpansion(macroExp);
// } // }
// } // }
@ -211,7 +216,7 @@ public class SemanticHighlightingReconciler implements ICReconcilingListener {
* @see org.eclipse.cdt.core.dom.ast.ASTVisitor#visit(org.eclipse.cdt.core.dom.ast.IASTDeclaration) * @see org.eclipse.cdt.core.dom.ast.ASTVisitor#visit(org.eclipse.cdt.core.dom.ast.IASTDeclaration)
*/ */
public int visit(IASTDeclaration declaration) { public int visit(IASTDeclaration declaration) {
if (!fFilePath.equals(declaration.getContainingFilename())) { if (!declaration.isPartOfTranslationUnitFile()) {
return PROCESS_SKIP; return PROCESS_SKIP;
} }
if (checkForMacro(declaration)) { if (checkForMacro(declaration)) {
@ -240,7 +245,7 @@ public class SemanticHighlightingReconciler implements ICReconcilingListener {
* @see org.eclipse.cdt.core.dom.ast.cpp.CPPASTVisitor#visit(org.eclipse.cdt.core.dom.ast.cpp.ICPPASTNamespaceDefinition) * @see org.eclipse.cdt.core.dom.ast.cpp.CPPASTVisitor#visit(org.eclipse.cdt.core.dom.ast.cpp.ICPPASTNamespaceDefinition)
*/ */
public int visit(ICPPASTNamespaceDefinition namespace) { public int visit(ICPPASTNamespaceDefinition namespace) {
if (!fFilePath.equals(namespace.getContainingFilename())) { if (!namespace.isPartOfTranslationUnitFile()) {
return PROCESS_SKIP; return PROCESS_SKIP;
} }
if (checkForMacro(namespace)) { if (checkForMacro(namespace)) {
@ -309,7 +314,7 @@ public class SemanticHighlightingReconciler implements ICReconcilingListener {
} }
private boolean checkForMacro(IASTNode node) { private boolean checkForMacro(IASTNode node) {
boolean isLeafNode= isLeafNode(node); int firstChildOffset= fgChildNodeFinder.getFirstChildOffset(node);
IASTNodeLocation[] nodeLocations= node.getNodeLocations(); IASTNodeLocation[] nodeLocations= node.getNodeLocations();
for (int i= 0; i < nodeLocations.length; i++) { for (int i= 0; i < nodeLocations.length; i++) {
IASTNodeLocation nodeLocation= nodeLocations[i]; IASTNodeLocation nodeLocation= nodeLocations[i];
@ -317,6 +322,9 @@ public class SemanticHighlightingReconciler implements ICReconcilingListener {
IASTNodeLocation useLocation= nodeLocation.asFileLocation(); IASTNodeLocation useLocation= nodeLocation.asFileLocation();
if (useLocation != null) { if (useLocation != null) {
final int useOffset = useLocation.getNodeOffset(); final int useOffset = useLocation.getNodeOffset();
if (useOffset > firstChildOffset) {
break;
}
if (useOffset > fMinLocation) { if (useOffset > fMinLocation) {
fMinLocation= useOffset; fMinLocation= useOffset;
IASTPreprocessorMacroDefinition macroDef= ((IASTMacroExpansion)nodeLocation).getMacroDefinition(); IASTPreprocessorMacroDefinition macroDef= ((IASTMacroExpansion)nodeLocation).getMacroDefinition();
@ -334,17 +342,10 @@ public class SemanticHighlightingReconciler implements ICReconcilingListener {
} }
} }
} }
if (!isLeafNode) {
break;
}
} }
return false; return false;
} }
private boolean isLeafNode(IASTNode node) {
return fgLeafNodeTester.isLeafNode(node);
}
private boolean visitMacro(IASTNode node, int macroLength) { private boolean visitMacro(IASTNode node, int macroLength) {
fToken.update(node); fToken.update(node);
for (int i= 0, n= fJobSemanticHighlightings.length; i < n; ++i) { for (int i= 0, n= fJobSemanticHighlightings.length; i < n; ++i) {
@ -536,7 +537,7 @@ public class SemanticHighlightingReconciler implements ICReconcilingListener {
if (ast == null || fJobPresenter.isCanceled()) if (ast == null || fJobPresenter.isCanceled())
return; return;
PositionCollector collector= new PositionCollector(ast.getFilePath()); PositionCollector collector= new PositionCollector();
startReconcilingPositions(); startReconcilingPositions();