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

groovy: canonicalize path to groovy jar in development mode

Browse Source
This commit is contained in:
nik
2014-09-11 18:59:09 +04:00
parent cb3aa54ac0
commit 8565894159
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/groovy/src/org/jetbrains/plugins/groovy/config/GroovyFacetUtil.java
+8 -2
View File
@@ -28,6 +28,7 @@ import com.intellij.openapi.roots.ModifiableRootModel;
import com.intellij.openapi.roots.ModuleRootManager;
import com.intellij.openapi.roots.libraries.Library;
import com.intellij.openapi.ui.Messages;
import com.intellij.openapi.util.io.FileUtil;
import com.intellij.util.PathUtil;
import icons.JetgroovyIcons;
import org.jetbrains.plugins.groovy.GroovyBundle;
@@ -76,8 +77,13 @@ public class GroovyFacetUtil {
}
public static File getBundledGroovyJar() {
String root = new File(PathUtil.getJarPathForClass(GroovyFacetUtil.class)).isDirectory() ?
PluginPathManager.getPluginHomePath("groovy") + "/../../lib/" : PathManager.getHomePath() + "/lib/";
String root;
if (new File(PathUtil.getJarPathForClass(GroovyFacetUtil.class)).isDirectory()) {
root = FileUtil.toCanonicalPath(PluginPathManager.getPluginHomePath("groovy") + "/../../lib/");
}
else {
root = PathManager.getHomePath() + "/lib/";
}
final File[] groovyJars = LibrariesUtil.getFilesInDirectoryByPattern(root, GroovyConfigUtils.GROOVY_ALL_JAR_PATTERN);
assert groovyJars.length == 1;
return groovyJars[0];