mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-07-31 12:55:40 +02:00
Code Issues Wiki Activity

Fix for 66695: [Indexer] Manually add an include path to a file/folder is ignored

Browse source 
Changed CompletionEngine getScannerInfo to get the info from a resource instead of
a project in order to get a complete list of include paths
This commit is contained in:
Bogdan Gheorghe 2004-06-24 21:51:38 +00:00
parent 7cee0b70c6
commit 0396ced3b7
5 changed files with 20 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
core/org.eclipse.cdt.core/search/ChangeLog
View file

@ -1,3 +1,9 @@
2004-06-24 Bogdan Gheorghe
Fix for 66695: [Indexer] Manually add an include path to a file/folder
is ignored by indexer
* search/org/eclipse/cdt/internal/core/search/matching/MatchLocator.java
2004-06-22 Alain Magloire 2004-06-22 Alain Magloire
Part of PR 68246. Part of PR 68246.
Close the inputstream to release resource handle Close the inputstream to release resource handle

2
core/org.eclipse.cdt.core/search/org/eclipse/cdt/internal/core/search/matching/MatchLocator.java
View file

@ -449,7 +449,7 @@ public class MatchLocator implements IMatchLocator{
IScannerInfo scanInfo = new ScannerInfo(); IScannerInfo scanInfo = new ScannerInfo();
IScannerInfoProvider provider = CCorePlugin.getDefault().getScannerInfoProvider(project); IScannerInfoProvider provider = CCorePlugin.getDefault().getScannerInfoProvider(project);
if (provider != null){ if (provider != null){
IScannerInfo buildScanInfo = provider.getScannerInformation(project); IScannerInfo buildScanInfo = provider.getScannerInformation(currentResource != null ? currentResource : project);
if( buildScanInfo != null ) if( buildScanInfo != null )
scanInfo = new ScannerInfo(buildScanInfo.getDefinedSymbols(), buildScanInfo.getIncludePaths()); scanInfo = new ScannerInfo(buildScanInfo.getDefinedSymbols(), buildScanInfo.getIncludePaths());
} }

9
core/org.eclipse.cdt.ui/ChangeLog
View file

@ -1,3 +1,12 @@
2004-06-24 Bogdan Gheorghe
Fix for 66695: [Indexer] Manually add an include path to a file/folder is ignored
Changed CompletionEngine getScannerInfo to get the info from a resource instead of
a project in order to get a complete list of include paths
* src/org/eclipse/cdt/internal/ui/search/actions/SelectionParseAction.java
* src/org/eclipse/cdt/internal/ui/text/contentassist/CompletionEngine.java
2004-06-24 Tanya Wolff 2004-06-24 Tanya Wolff
Fix for PR 60299: Accessibility: Lost children in Binary Parser properties dialog Fix for PR 60299: Accessibility: Lost children in Binary Parser properties dialog
Switched the binary parsers Options group with its child composite so the Switched the binary parsers Options group with its child composite so the

4
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/search/actions/SelectionParseAction.java
View file

@ -68,12 +68,14 @@ public class SelectionParseAction extends Action {
} }
protected IParser setupParser(IFile resourceFile) { protected IParser setupParser(IFile resourceFile) {
//Get the scanner info //Get the scanner info
IProject currentProject = resourceFile.getProject(); IProject currentProject = resourceFile.getProject();
IScannerInfo scanInfo = new ScannerInfo(); IScannerInfo scanInfo = new ScannerInfo();
IScannerInfoProvider provider = CCorePlugin.getDefault().getScannerInfoProvider(currentProject); IScannerInfoProvider provider = CCorePlugin.getDefault().getScannerInfoProvider(currentProject);
if (provider != null){ if (provider != null){
IScannerInfo buildScanInfo = provider.getScannerInformation(currentProject); IScannerInfo buildScanInfo = provider.getScannerInformation(resourceFile);
if (buildScanInfo != null){ if (buildScanInfo != null){
scanInfo = new ScannerInfo(buildScanInfo.getDefinedSymbols(), buildScanInfo.getIncludePaths()); scanInfo = new ScannerInfo(buildScanInfo.getDefinedSymbols(), buildScanInfo.getIncludePaths());
} }

2
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/CompletionEngine.java
View file

@ -156,7 +156,7 @@ public class CompletionEngine implements RelevanceConstants {
IScannerInfo scanInfo = new ScannerInfo(); IScannerInfo scanInfo = new ScannerInfo();
IScannerInfoProvider provider = CCorePlugin.getDefault().getScannerInfoProvider(project); IScannerInfoProvider provider = CCorePlugin.getDefault().getScannerInfoProvider(project);
if (provider != null){ if (provider != null){
IScannerInfo buildScanInfo = provider.getScannerInformation(project); IScannerInfo buildScanInfo = provider.getScannerInformation(currentResource);
if( buildScanInfo != null ) if( buildScanInfo != null )
scanInfo = new ScannerInfo(buildScanInfo.getDefinedSymbols(), buildScanInfo.getIncludePaths()); scanInfo = new ScannerInfo(buildScanInfo.getDefinedSymbols(), buildScanInfo.getIncludePaths());
} }