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

fixed PY-10740 Error trying to create new Pyramid project

Browse Source 
removed duplicated code
This commit is contained in:
Ekaterina Tuzova
2013-09-07 19:26:15 +04:00
parent 3a590b3bc0
commit 78de90beb7
8 changed files with 91 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files
python/python-rest/resources/META-INF/python-rest-plugin.xml
+1
View File
@@ -15,6 +15,7 @@
<lang.substitutor language="TEXT" implementationClass="com.jetbrains.rest.RestLanguageSubstitutor"/>
<languageInjector implementation="com.jetbrains.rest.PyRestDocstringLanguageInjector"/>
<completion.contributor language="ReST" implementationClass="com.jetbrains.rest.completion.SphinxDirectiveCompletionContributor"/>
</extensions>
<actions>
python/python-rest/src/com/jetbrains/rest/RestPythonUtil.java
+8 -1
View File
@@ -8,11 +8,13 @@ import com.intellij.openapi.module.Module;
import com.intellij.openapi.module.ModuleManager;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.projectRoots.Sdk;
import com.intellij.openapi.util.SystemInfo;
import com.jetbrains.python.packaging.PyExternalProcessException;
import com.jetbrains.python.packaging.PyPackage;
import com.jetbrains.python.packaging.PyPackageManager;
import com.jetbrains.python.packaging.PyPackageManagerImpl;
import com.jetbrains.python.sdk.PythonSdkType;
import org.jetbrains.annotations.Nullable;
/**
* User : catherine
@@ -36,7 +38,7 @@ public class RestPythonUtil {
PyPackageManagerImpl manager = (PyPackageManagerImpl)PyPackageManager.getInstance(sdk);
try {
final PyPackage sphinx = manager.findPackage("Sphinx");
String quickStart = RestUtil.findQuickStart(sdk.getHomePath());
String quickStart = findQuickStart(sdk);
presentation.setEnabled(sphinx != null && quickStart != null);
}
catch (PyExternalProcessException ignored) {
@@ -47,4 +49,9 @@ public class RestPythonUtil {
return presentation;
}
@Nullable
public static String findQuickStart(final Sdk sdkHome) {
final String runnerName = "sphinx-quickstart" + (SystemInfo.isWindows ? ".exe" : "");
return PythonSdkType.getExecutablePath(sdkHome, runnerName);
}
}
python/python-rest/src/com/jetbrains/rest/completion/SphinxDirectiveCompletionContributor.java
+47
View File
@@ -0,0 +1,47 @@
package com.jetbrains.rest.completion;
import com.intellij.codeInsight.completion.*;
import com.intellij.codeInsight.lookup.LookupElementBuilder;
import com.intellij.openapi.projectRoots.Sdk;
import com.intellij.openapi.roots.ProjectRootManager;
import com.intellij.patterns.PsiElementPattern;
import com.intellij.psi.PsiElement;
import com.intellij.util.ProcessingContext;
import com.jetbrains.rest.RestPythonUtil;
import com.jetbrains.rest.RestTokenTypes;
import com.jetbrains.rest.RestUtil;
import com.jetbrains.rest.psi.RestReferenceTarget;
import org.jetbrains.annotations.NotNull;
import static com.intellij.patterns.PlatformPatterns.psiElement;
import static com.intellij.patterns.StandardPatterns.or;
/**
* User : ktisha
*/
public class SphinxDirectiveCompletionContributor extends CompletionContributor {
public static final PsiElementPattern.Capture<PsiElement> DIRECTIVE_PATTERN = psiElement().afterSibling(or(psiElement().
withElementType(RestTokenTypes.WHITESPACE).afterSibling(psiElement(RestReferenceTarget.class)),
psiElement().withElementType(RestTokenTypes.EXPLISIT_MARKUP_START)));
public SphinxDirectiveCompletionContributor() {
extend(CompletionType.BASIC, DIRECTIVE_PATTERN,
new CompletionProvider<CompletionParameters>() {
@Override
protected void addCompletions(@NotNull CompletionParameters parameters,
ProcessingContext context,
@NotNull CompletionResultSet result) {
Sdk sdk = ProjectRootManager.getInstance(parameters.getPosition().getProject()).getProjectSdk();
if (sdk != null) {
String sphinx = RestPythonUtil.findQuickStart(sdk);
if (sphinx != null) {
for (String tag : RestUtil.SPHINX_DIRECTIVES) {
result.addElement(LookupElementBuilder.create(tag));
}
}
}
}
}
);
}
}
python/python-rest/src/com/jetbrains/rest/inspections/RestRoleInspection.java
+2 -5
View File
@@ -19,10 +19,7 @@ import com.intellij.psi.util.PsiTreeUtil;
import com.intellij.util.containers.HashSet;
import com.jetbrains.python.ReSTService;
import com.jetbrains.python.psi.*;
import com.jetbrains.rest.RestBundle;
import com.jetbrains.rest.RestFile;
import com.jetbrains.rest.RestTokenTypes;
import com.jetbrains.rest.RestUtil;
import com.jetbrains.rest.*;
import com.jetbrains.rest.psi.RestDirectiveBlock;
import com.jetbrains.rest.psi.RestRole;
import com.jetbrains.rest.quickfixes.AddIgnoredRoleFix;
@@ -114,7 +111,7 @@ public class RestRoleInspection extends RestInspection {
Sdk sdk = ProjectRootManager.getInstance(node.getProject()).getProjectSdk();
if (sdk != null) {
String sphinx = RestUtil.findQuickStart(sdk.getHomePath());
String sphinx = RestPythonUtil.findQuickStart(sdk);
if (sphinx != null) {
if (RestUtil.SPHINX_ROLES.contains(node.getText()) || RestUtil.SPHINX_ROLES.contains(":py"+node.getText())
|| mySphinxRoles.contains(node.getRoleName())) return;
python/python-rest/src/com/jetbrains/rest/sphinx/SphinxBaseCommand.java
+2 -2
View File
@@ -22,7 +22,7 @@ import com.jetbrains.python.run.PythonCommandLineState;
import com.jetbrains.python.run.PythonProcessRunner;
import com.jetbrains.python.run.PythonTracebackFilter;
import com.jetbrains.python.sdk.PythonSdkType;
import com.jetbrains.rest.RestUtil;
import com.jetbrains.rest.RestPythonUtil;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
@@ -169,6 +169,6 @@ public class SphinxBaseCommand {
@Nullable
private static String getCommandPath(Sdk sdk) {
return RestUtil.findQuickStart(sdk.getHomePath());
return RestPythonUtil.findQuickStart(sdk);
}
}