MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

pass Project to isFrameworkInstalled(); working implementation of qname resolution in SDK only

Browse Source
This commit is contained in:
Dmitry Jemerov
2012-08-08 11:49:17 +02:00
parent 01897c8ab2
commit ec037665f6
3 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
python/openapi/src/com/jetbrains/python/newProject/PyFrameworkProjectGenerator.java
+2 -1
View File
@@ -1,5 +1,6 @@
package com.jetbrains.python.newProject;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.projectRoots.Sdk;
import com.intellij.platform.DirectoryProjectGenerator;
@@ -9,5 +10,5 @@ import com.intellij.platform.DirectoryProjectGenerator;
public interface PyFrameworkProjectGenerator<T> extends DirectoryProjectGenerator<T> {
String getFrameworkTitle();
boolean isFrameworkInstalled(Sdk sdk);
boolean isFrameworkInstalled(Project project, Sdk sdk);
}
python/psi-api/src/com/jetbrains/python/psi/resolve/QualifiedNameResolver.java
+3
View File
@@ -1,6 +1,7 @@
package com.jetbrains.python.psi.resolve;
import com.intellij.openapi.module.Module;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.projectRoots.Sdk;
import com.intellij.psi.PsiElement;
import com.intellij.psi.PsiFileSystemItem;
@@ -17,6 +18,8 @@ public interface QualifiedNameResolver {
QualifiedNameResolver fromModule(@NotNull Module module);
QualifiedNameResolver fromSdk(@NotNull Project project, @NotNull Sdk sdk);
QualifiedNameResolver withAllModules();
QualifiedNameResolver withSdk(Sdk sdk);
python/src/com/jetbrains/python/psi/resolve/QualifiedNameResolverImpl.java
+8
View File
@@ -6,6 +6,7 @@ import com.intellij.facet.FacetManager;
import com.intellij.openapi.module.Module;
import com.intellij.openapi.module.ModuleManager;
import com.intellij.openapi.module.ModuleUtilCore;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.projectRoots.Sdk;
import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.psi.*;
@@ -72,6 +73,13 @@ public class QualifiedNameResolverImpl implements RootVisitor, QualifiedNameReso
return this;
}
@Override
public QualifiedNameResolver fromSdk(@NotNull Project project, @NotNull Sdk sdk) {
myPsiManager = PsiManager.getInstance(project);
myWithSdk = sdk;
return this;
}
private void setModule(@Nullable Module module) {
myModule = module;
if (module != null && FacetManager.getInstance(module).getFacetByType(DjangoFacetType.ID) != null) {