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

search for sphinx-quckstart in default location

Browse Source 
fixed PY-10238 sphinx-quickstart couldn't be found under /usr/local/bin
This commit is contained in:
Ekaterina Tuzova
2013-07-08 17:21:34 +04:00
parent e390abfb28
commit 5ace3a28b2
5 changed files with 31 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
python/rest/src/com/jetbrains/rest/RestUtil.java
+17 -12
View File
@@ -2,6 +2,7 @@ package com.jetbrains.rest;
import com.google.common.collect.Maps;
import com.google.common.collect.Sets;
import com.intellij.openapi.util.SystemInfo;
import com.intellij.openapi.vfs.LocalFileSystem;
import org.jetbrains.annotations.Nullable;
@@ -16,24 +17,28 @@ public class RestUtil {
private RestUtil() {}
@Nullable
public static String findRunner(final String sdkHome, String runnerName) {
String shortRunner = null;
if (runnerName.endsWith(".py")) shortRunner = runnerName.substring(0, runnerName.length()-3);
File bin_path = new File(sdkHome);
File bin_dir = bin_path.getParentFile();
if (bin_dir == null) return null;
File runner = new File(bin_dir, runnerName);
public static String findQuickStart(final String sdkHome) {
final String runnerName = "sphinx-quickstart" + (SystemInfo.isWindows ? ".exe" : "");
File binPath = new File(sdkHome);
File binDir = binPath.getParentFile();
if (binDir == null) return null;
File runner = new File(binDir, runnerName);
if (runner.exists()) return LocalFileSystem.getInstance().extractPresentableUrl(runner.getPath());
runner = new File(new File(bin_dir, "scripts"), runnerName);
runner = new File(new File(binDir, "scripts"), runnerName);
if (runner.exists()) return LocalFileSystem.getInstance().extractPresentableUrl(runner.getPath());
runner = new File(new File(bin_dir.getParentFile(), "scripts"), runnerName);
runner = new File(new File(binDir.getParentFile(), "scripts"), runnerName);
if (runner.exists()) return LocalFileSystem.getInstance().extractPresentableUrl(runner.getPath());
runner = new File(new File(bin_dir.getParentFile(), "local"), runnerName);
runner = new File(new File(binDir.getParentFile(), "local"), runnerName);
if (runner.exists()) return LocalFileSystem.getInstance().extractPresentableUrl(runner.getPath());
runner = new File(new File (new File(bin_dir.getParentFile(), "local"), "bin"), runnerName);
runner = new File(new File (new File(binDir.getParentFile(), "local"), "bin"), runnerName);
if (runner.exists()) return LocalFileSystem.getInstance().extractPresentableUrl(runner.getPath());
// Search in standard unix path
runner = new File(new File("/usr", "bin"), runnerName);
if (runner.exists()) return LocalFileSystem.getInstance().extractPresentableUrl(runner.getPath());
runner = new File(new File (new File("/usr", "local"), "bin"), runnerName);
if (runner.exists()) return LocalFileSystem.getInstance().extractPresentableUrl(runner.getPath());
if (shortRunner != null) return findRunner(sdkHome, shortRunner);
return null;
}
python/rest/src/com/jetbrains/rest/completion/DirectiveCompletionContributor.java
+2 -3
View File
@@ -4,7 +4,6 @@ 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.openapi.util.SystemInfo;
import com.intellij.patterns.PsiElementPattern;
import com.intellij.psi.PsiElement;
import com.intellij.util.ProcessingContext;
@@ -36,8 +35,8 @@ public class DirectiveCompletionContributor extends CompletionContributor {
}
Sdk sdk = ProjectRootManager.getInstance(parameters.getPosition().getProject()).getProjectSdk();
if (sdk != null) {
String sphinx = RestUtil.findRunner(sdk.getHomePath(), "sphinx-quickstart"+ (SystemInfo.isWindows ? ".exe" : ""));
if (sphinx != null && !sphinx.isEmpty()) {
String sphinx = RestUtil.findQuickStart(sdk.getHomePath());
if (sphinx != null) {
for (String tag : RestUtil.SPHINX_DIRECTIVES) {
result.addElement(LookupElementBuilder.create(tag));
}