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

Merge branch 'master' of git@git.labs.intellij.net:idea/community

Browse Source
This commit is contained in:
Kirill Kalishev
2011-02-14 20:43:36 +03:00
parent 4f3b9672f3 d273b8409b
commit 02c5a7b194
4 changed files with 25 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/compiler/impl/src/com/intellij/compiler/impl/javaCompiler/BackendCompilerWrapper.java
+9 -2
View File
@@ -21,11 +21,11 @@
*/
package com.intellij.compiler.impl.javaCompiler;
import com.intellij.codeInsight.AnnotationUtil;
import com.intellij.codeInsight.NullableNotNullManager;
import com.intellij.compiler.*;
import com.intellij.compiler.classParsing.AnnotationConstantValue;
import com.intellij.compiler.classParsing.MethodInfo;
import com.intellij.compiler.impl.CompileDriver;
import com.intellij.compiler.impl.CompilerUtil;
import com.intellij.compiler.make.Cache;
import com.intellij.compiler.make.CacheCorruptedException;
@@ -348,7 +348,7 @@ public class BackendCompilerWrapper {
int exitValue = 0;
try {
Process process = myCompiler.launchProcess(chunk, outputDir, myCompileContext);
final Process process = myCompiler.launchProcess(chunk, outputDir, myCompileContext);
final long compilationStart = System.currentTimeMillis();
final ClassParsingThread classParsingThread = new ClassParsingThread(isJdk6(chunk.getJdk()), outputDir);
final Future<?> classParsingThreadFuture = ApplicationManager.getApplication().executeOnPooledThread(classParsingThread);
@@ -377,10 +377,17 @@ public class BackendCompilerWrapper {
exitValue = process.waitFor();
}
catch (InterruptedException e) {
if (CompileDriver.ourDebugMode) {
System.out.println("Compiler interrupted; ");
e.printStackTrace();
}
process.destroy();
exitValue = process.exitValue();
}
finally {
if (CompileDriver.ourDebugMode) {
System.out.println("Compiler exit code is " + exitValue);
}
if (errorParsingThread != null) {
errorParsingThread.setProcessTerminated(true);
}
java/java-runtime/src/com/intellij/rt/compiler/JavacRunner.java
+7 -1
View File
@@ -67,7 +67,13 @@ public class JavacRunner {
System.arraycopy(args, 2, newArgs, 0, newArgs.length);
}
expandClasspath(newArgs);
mainMethod.invoke(null, new Object[] {newArgs});
try {
mainMethod.invoke(null, new Object[] {newArgs});
}
catch (Throwable e) {
System.err.print(e.getMessage());
e.printStackTrace(System.err);
}
}
private static void addFilesToCompile(Vector arguments, String path) throws IOException {
platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/LocalInspectionsPassFactory.java
+8 -1
View File
@@ -27,6 +27,7 @@ import com.intellij.openapi.editor.Editor;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.util.TextRange;
import com.intellij.psi.PsiFile;
import com.intellij.util.PlatformUtils;
import org.jetbrains.annotations.NonNls;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
@@ -40,7 +41,13 @@ import java.util.List;
public class LocalInspectionsPassFactory extends AbstractProjectComponent implements TextEditorHighlightingPassFactory {
public LocalInspectionsPassFactory(Project project, TextEditorHighlightingPassRegistrar highlightingPassRegistrar) {
super(project);
highlightingPassRegistrar.registerTextEditorHighlightingPass(this, null, new int[]{Pass.UPDATE_ALL/*, Pass.POPUP_HINTS*/}, true, Pass.LOCAL_INSPECTIONS);
if ( PlatformUtils.isCidr()) { //TODO rework this hack
highlightingPassRegistrar.registerTextEditorHighlightingPass(this, new int[]{Pass.UPDATE_ALL/*, Pass.POPUP_HINTS*/}, null, true, Pass.LOCAL_INSPECTIONS);
}
else {
highlightingPassRegistrar.registerTextEditorHighlightingPass(this, null, new int[]{Pass.UPDATE_ALL/*, Pass.POPUP_HINTS*/}, true, Pass.LOCAL_INSPECTIONS);
}
}
@NonNls
plugins/devkit/src/projectRoots/IdeaJdk.java
+1 -1
View File
@@ -171,7 +171,7 @@ public class IdeaJdk extends SdkType implements JavaSdkType {
private static VirtualFile[] getIdeaLibrary(String home) {
ArrayList<VirtualFile> result = new ArrayList<VirtualFile>();
appendIdeaLibrary(home + File.separator + LIB_DIR_NAME, "idea.jar", result);
appendIdeaLibrary(home + File.separator + LIB_DIR_NAME, null, result);
appendIdeaLibrary(home + File.separator + PLUGINS_DIR + File.separator + JAVAEE_DIR + File.separator + LIB_DIR_NAME, "javaee-impl.jar",
result);
appendIdeaLibrary(home + File.separator + PLUGINS_DIR + File.separator + JSF_DIR + File.separator + LIB_DIR_NAME, "jsf-impl.jar", result);