Attachment 59929 Details for Bug 175762 – patch file.

[patch] patch file.

openincludeaction_patch.txt (text/plain), 1.84 KB, created by Warren Paul

on 2007-02-27 18:12:21 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Warren Paul

Created: 2007-02-27 18:12:21 EST

Size: 1.84 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.cdt.ui
>Index: src/org/eclipse/cdt/internal/ui/editor/OpenIncludeAction.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.cdt-core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/OpenIncludeAction.java,v
>retrieving revision 1.21
>diff -u -r1.21 OpenIncludeAction.java
>--- src/org/eclipse/cdt/internal/ui/editor/OpenIncludeAction.java	13 Feb 2007 18:34:34 -0000	1.21
>+++ src/org/eclipse/cdt/internal/ui/editor/OpenIncludeAction.java	27 Feb 2007 22:49:31 -0000
>@@ -43,6 +43,8 @@
> import org.eclipse.cdt.core.CCorePlugin;
> import org.eclipse.cdt.core.model.CModelException;
> import org.eclipse.cdt.core.model.ICElement;
>+import org.eclipse.cdt.core.parser.ExtendedScannerInfo;
>+import org.eclipse.cdt.core.parser.IExtendedScannerInfo;
> import org.eclipse.cdt.core.parser.IScannerInfo;
> import org.eclipse.cdt.core.parser.IScannerInfoProvider;
> import org.eclipse.cdt.ui.CUIPlugin;
>@@ -95,12 +97,22 @@
> 						info = provider.getScannerInformation(proj);
> 					}
> 					if (info != null) {
>+						// search in system includes
> 						String[] includePaths = info.getIncludePaths();
> 						findFile(includePaths, includeName, filesFound);
> 					}
> 					if (filesFound.size() == 0) {
>-						// Fall back and search the project
>-						findFile(proj, new Path(includeName), filesFound);
>+						// search in local includes
>+						if (info != null) {
>+							IExtendedScannerInfo scanInfo = new ExtendedScannerInfo(info);
>+							String[] localIncludePaths = scanInfo.getLocalIncludePath();
>+							findFile(localIncludePaths, includeName, filesFound);
>+						}
>+						
>+						if (filesFound.size() == 0) {
>+							// Fall back and search the project
>+							findFile(proj, new Path(includeName), filesFound);
>+						}
> 					}
> 				}
> 			}

Flags:

bjorn.freeman-benson: iplog+

Actions: View | Diff

Attachments on bug 175762: 59929 | 61322