aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorzzhongwei2013-01-22 02:44:25 (EST)
committerzzhongwei2013-01-22 02:44:25 (EST)
commitf980463f5f5c7edb6378d7e8872954466c5cc5ff (patch)
tree3fbbb115e99d041cd80c6ed27cfb68a2c91426fb
parent423a0aeceedee4f3abc30bc83442ccd520291ddb (diff)
downloadorg.eclipse.pdt-f980463f5f5c7edb6378d7e8872954466c5cc5ff.zip
org.eclipse.pdt-f980463f5f5c7edb6378d7e8872954466c5cc5ff.tar.gz
org.eclipse.pdt-f980463f5f5c7edb6378d7e8872954466c5cc5ff.tar.bz2
398708: [regression] Added resources in project PHP include path are not
suggested by Content Assist https://bugs.eclipse.org/bugs/show_bug.cgi?id=398708
-rw-r--r--plugins/org.eclipse.php.core/src/org/eclipse/php/internal/core/codeassist/contexts/QuotesContext.java4
1 files changed, 4 insertions, 0 deletions
diff --git a/plugins/org.eclipse.php.core/src/org/eclipse/php/internal/core/codeassist/contexts/QuotesContext.java b/plugins/org.eclipse.php.core/src/org/eclipse/php/internal/core/codeassist/contexts/QuotesContext.java
index dcf0bcf..221b740 100644
--- a/plugins/org.eclipse.php.core/src/org/eclipse/php/internal/core/codeassist/contexts/QuotesContext.java
+++ b/plugins/org.eclipse.php.core/src/org/eclipse/php/internal/core/codeassist/contexts/QuotesContext.java
@@ -21,12 +21,16 @@ import org.eclipse.php.internal.core.documentModel.partitioner.PHPPartitionTypes
* @author michael
*/
public class QuotesContext extends AbstractCompletionContext {
+ private IncludeStatementContext includeStatementContext = new IncludeStatementContext();
public boolean isValid(ISourceModule sourceModule, int offset,
CompletionRequestor requestor) {
if (!super.isValid(sourceModule, offset, requestor)) {
return false;
}
+ if (includeStatementContext.isValid(sourceModule, offset, requestor)) {
+ return false;
+ }
return (getPartitionType() == PHPPartitionTypes.PHP_QUOTED_STRING);
}
}