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

load idea project via jps for real: show progress & better module-libs fix

Browse Source
This commit is contained in:
Gregory.Shrago
2016-11-18 19:15:41 +03:00
parent 4df7574a70
commit c3447c457e
1 changed files with 27 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/devkit/src/projectRoots/IdeaJdk.java
+27 -20
View File
@@ -18,6 +18,8 @@ package org.jetbrains.idea.devkit.projectRoots;
import com.intellij.openapi.application.ApplicationStarter;
import com.intellij.openapi.application.PathManager;
import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.progress.ProcessCanceledException;
import com.intellij.openapi.progress.ProgressManager;
import com.intellij.openapi.projectRoots.*;
import com.intellij.openapi.projectRoots.impl.JavaDependentSdkType;
import com.intellij.openapi.roots.AnnotationOrderRootType;
@@ -26,6 +28,7 @@ import com.intellij.openapi.roots.OrderRootType;
import com.intellij.openapi.ui.Messages;
import com.intellij.openapi.util.InvalidDataException;
import com.intellij.openapi.util.SystemInfo;
import com.intellij.openapi.util.ThrowableComputable;
import com.intellij.openapi.util.WriteExternalException;
import com.intellij.openapi.util.io.FileUtil;
import com.intellij.openapi.vfs.JarFileSystem;
@@ -334,7 +337,20 @@ public class IdeaJdk extends JavaDependentSdkType implements JavaSdkType {
private static boolean setupSdkPaths(Sdk sdk, SdkModificator sdkModificator, SdkModel sdkModel) {
String sdkHome = ObjectUtils.notNull(sdk.getHomePath());
if (isFromIDEAProject(sdkHome)) {
return setupSdkPathsFromIDEAProject(sdk, sdkModificator, sdkModel);
try {
ProgressManager.getInstance().runProcessWithProgressSynchronously((ThrowableComputable<Void, IOException>)() -> {
setupSdkPathsFromIDEAProject(sdk, sdkModificator, sdkModel);
return null;
}, "Scanning for Roots", true, null);
}
catch (ProcessCanceledException e) {
return false;
}
catch (IOException e) {
LOG.warn(e);
Messages.showErrorDialog(e.toString(), DevKitBundle.message("sdk.title"));
return false;
}
}
else {
VirtualFile[] ideaLib = getIdeaLibrary(sdkHome);
@@ -342,28 +358,20 @@ public class IdeaJdk extends JavaDependentSdkType implements JavaSdkType {
sdkModificator.addRoot(aIdeaLib, OrderRootType.CLASSES);
}
addSources(new File(sdkHome), sdkModificator);
return true;
}
return true;
}
private static boolean setupSdkPathsFromIDEAProject(Sdk sdk, SdkModificator sdkModificator, SdkModel sdkModel) {
private static void setupSdkPathsFromIDEAProject(Sdk sdk, SdkModificator sdkModificator, SdkModel sdkModel) throws IOException {
String sdkHome = ObjectUtils.notNull(sdk.getHomePath());
JpsModel model;
try {
model = JpsSerializationManager.getInstance().loadModel(sdkHome, PathManager.getOptionsPath());
}
catch (IOException e) {
LOG.warn(e);
Messages.showErrorDialog(e.toString(), DevKitBundle.message("sdk.title"));
return false;
}
JpsModel model = JpsSerializationManager.getInstance().loadModel(sdkHome, PathManager.getOptionsPath());
JpsSdkReference<JpsDummyElement> sdkRef = model.getProject().getSdkReferencesTable().getSdkReference(JpsJavaSdkType.INSTANCE);
String sdkName = sdkRef == null ? null : sdkRef.getSdkName();
Sdk internalJava = sdkModel.findSdk(sdkName);
if (internalJava != null && isValidInternalJdk(sdk, internalJava)) {
setInternalJdk(sdk, sdkModificator, internalJava);
}
Set<String> addedLibs = ContainerUtil.newTroveSet();
Set<VirtualFile> addedRoots = ContainerUtil.newTroveSet();
VirtualFileManager vfsManager = VirtualFileManager.getInstance();
JpsJavaExtensionService javaService = JpsJavaExtensionService.getInstance();
boolean isUltimate = vfsManager.findFileByUrl(VfsUtilCore.pathToUrl(sdkHome + "/ultimate/ultimate-resources")) != null;
@@ -380,23 +388,22 @@ public class IdeaJdk extends JavaDependentSdkType implements JavaSdkType {
.toList();
for (JpsModule o : modules) {
for (JpsDependencyElement dep : o.getDependenciesList().getDependencies()) {
ProgressManager.checkCanceled();
JpsLibrary library = dep instanceof JpsLibraryDependency ? ((JpsLibraryDependency)dep).getLibrary() : null;
if (library == null) continue;
if (library.getType() != JpsJavaLibraryType.INSTANCE) continue;
// module-library: name starts with '#'
if (!library.getName().startsWith("#") && !addedLibs.add(library.getName())) continue;
if (library.getType() instanceof JpsJavaLibraryType) continue;
JpsJavaDependencyExtension extension = javaService.getDependencyExtension(dep);
if (extension == null) continue;
// do not check extension.getScope(), plugin projects need tests too
for (JpsLibraryRoot jps : library.getRoots(JpsOrderRootType.COMPILED)) {
VirtualFile root = vfsManager.findFileByUrl(jps.getUrl());
if (root == null) continue;
if (root == null || !addedRoots.add(root)) continue;
sdkModificator.addRoot(root, OrderRootType.CLASSES);
}
for (JpsLibraryRoot jps : library.getRoots(JpsOrderRootType.SOURCES)) {
VirtualFile root = vfsManager.findFileByUrl(jps.getUrl());
if (root == null) continue;
if (root == null || !addedRoots.add(root)) continue;
sdkModificator.addRoot(root, OrderRootType.SOURCES);
}
}
@@ -407,12 +414,12 @@ public class IdeaJdk extends JavaDependentSdkType implements JavaSdkType {
if (outputRoot == null) continue;
sdkModificator.addRoot(outputRoot, OrderRootType.CLASSES);
for (JpsModuleSourceRoot jps : o.getSourceRoots()) {
ProgressManager.checkCanceled();
VirtualFile root = vfsManager.findFileByUrl(jps.getUrl());
if (root == null) continue;
if (root == null || !addedRoots.add(root)) continue;
sdkModificator.addRoot(root, OrderRootType.SOURCES);
}
}
return true;
}
static String getDefaultSandbox() {