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' into upsource-master

Browse Source
This commit is contained in:
Evgeny Pasynkov
2012-05-23 12:29:25 +02:00
parent f2fb99be56 57e722d1b6
commit 3372ed86d0
78 changed files with 1055 additions and 561 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/compiler/impl/src/com/intellij/compiler/impl/CompileDriver.java
+38 -39
View File
@@ -98,6 +98,7 @@ import org.jetbrains.jps.api.JpsRemoteProto;
import org.jetbrains.jps.api.JpsServerResponseHandler;
import org.jetbrains.jps.api.RequestFuture;
import javax.swing.*;
import java.io.*;
import java.util.*;
import java.util.concurrent.TimeUnit;
@@ -415,8 +416,8 @@ public class CompileDriver {
}
@Nullable
private RequestFuture compileOnServer(final @NotNull CompileContextImpl compileContext, @NotNull Collection<Module> modules, @NotNull Collection<Artifact> artifacts,
final @NotNull Collection<String> paths, @Nullable final CompileStatusNotification callback)
private RequestFuture compileInExternalProcess(final @NotNull CompileContextImpl compileContext, @NotNull Collection<Module> modules, @NotNull Collection<Artifact> artifacts,
final @NotNull Collection<String> paths, @Nullable final CompileStatusNotification callback)
throws Exception {
Collection<String> moduleNames = Collections.emptyList();
if (modules.size() > 0) {
@@ -546,10 +547,7 @@ public class CompileDriver {
return buildManager.scheduleBuild(myProject, compileContext.isRebuild(), compileContext.isMake(), moduleNames, artifactNames, paths, builderParams, new DefaultMessageHandler(myProject) {
@Override
public void sessionTerminated() {
final ExitStatus status = COMPILE_SERVER_BUILD_STATUS.get(compileContext);
if (status != null) {
notifyCompilationCompleted(compileContext, callback, status);
}
notifyCompilationCompleted(compileContext, callback, COMPILE_SERVER_BUILD_STATUS.get(compileContext));
}
@Override
@@ -643,7 +641,7 @@ public class CompileDriver {
final boolean checkCachesVersion) {
ApplicationManager.getApplication().assertIsDispatchThread();
final boolean useServer = useOutOfProcessBuild();
final boolean useExtProcessBuild = useOutOfProcessBuild();
final String contentName =
forceCompile ? CompilerBundle.message("compiler.content.name.compile") : CompilerBundle.message("compiler.content.name.make");
@@ -656,12 +654,12 @@ public class CompileDriver {
PsiDocumentManager.getInstance(myProject).commitAllDocuments();
FileDocumentManager.getInstance().saveAllDocuments();
final DependencyCache dependencyCache = useServer? null: createDependencyCache();
final DependencyCache dependencyCache = useExtProcessBuild ? null: createDependencyCache();
final CompileContextImpl compileContext =
new CompileContextImpl(myProject, compileTask, scope, dependencyCache, !isRebuild && !forceCompile, isRebuild);
compileContext.putUserData(COMPILATION_START_TIMESTAMP, LocalTimeCounter.currentTime());
if (!useServer) {
if (!useExtProcessBuild) {
for (Map.Entry<Pair<IntermediateOutputCompiler, Module>, Pair<VirtualFile, VirtualFile>> entry : myGenerationCompilerModuleToOutputDirMap.entrySet()) {
final Pair<VirtualFile, VirtualFile> outputs = entry.getValue();
final Pair<IntermediateOutputCompiler, Module> key = entry.getKey();
@@ -673,21 +671,18 @@ public class CompileDriver {
}
final Runnable compileWork;
if (useServer) {
if (useExtProcessBuild) {
compileWork = new Runnable() {
public void run() {
final ProgressIndicator indicator = compileContext.getProgressIndicator();
if (indicator.isCanceled()) {
if (indicator.isCanceled() || myProject.isDisposed()) {
if (callback != null) {
callback.finished(true, 0, 0, compileContext);
}
return;
}
long start = System.currentTimeMillis();
final long start = System.currentTimeMillis();
try {
if (myProject.isDisposed()) {
return;
}
LOG.info("COMPILATION STARTED " + (CompilerWorkspaceConfiguration.useServerlessOutOfProcessBuild() ? "(BUILD PROCESS)" : "(COMPILE SERVER)"));
if (message != null) {
compileContext.addMessage(message);
@@ -695,7 +690,7 @@ public class CompileDriver {
final Collection<String> paths = fetchFiles(compileContext);
final List<Module> modules = paths.isEmpty()? Arrays.asList(compileContext.getCompileScope().getAffectedModules()) : Collections.<Module>emptyList();
final Set<Artifact> artifacts = ArtifactCompileScope.getArtifactsToBuild(myProject, compileContext.getCompileScope(), true);
final RequestFuture future = compileOnServer(compileContext, modules, artifacts, paths, callback);
final RequestFuture future = compileInExternalProcess(compileContext, modules, artifacts, paths, callback);
if (future != null) {
while (!future.waitFor(200L , TimeUnit.MILLISECONDS)) {
if (indicator.isCanceled()) {
@@ -707,7 +702,7 @@ public class CompileDriver {
callback.finished(false, compileContext.getMessageCount(CompilerMessageCategory.ERROR), compileContext.getMessageCount(CompilerMessageCategory.WARNING), compileContext);
}
}
catch (Exception e) {
catch (Throwable e) {
LOG.error(e); // todo
callback.finished(false, compileContext.getMessageCount(CompilerMessageCategory.ERROR), compileContext.getMessageCount(CompilerMessageCategory.WARNING), compileContext);
}
@@ -876,31 +871,35 @@ public class CompileDriver {
}
}
/** @noinspection SSBasedInspection*/
private void notifyCompilationCompleted(final CompileContextImpl compileContext, final CompileStatusNotification callback, final ExitStatus _status) {
final long duration = System.currentTimeMillis() - compileContext.getStartCompilationStamp();
ApplicationManager.getApplication().invokeLater(new Runnable() {
SwingUtilities.invokeLater(new Runnable() {
public void run() {
if (myProject.isDisposed()) {
return;
int errorCount = 0;
int warningCount = 0;
try {
errorCount = compileContext.getMessageCount(CompilerMessageCategory.ERROR);
warningCount = compileContext.getMessageCount(CompilerMessageCategory.WARNING);
if (!myProject.isDisposed()) {
final String statusMessage = createStatusMessage(_status, warningCount, errorCount);
final MessageType messageType = errorCount > 0 ? MessageType.ERROR : warningCount > 0 ? MessageType.WARNING : MessageType.INFO;
if (duration > ONE_MINUTE_MS) {
ToolWindowManager.getInstance(myProject).notifyByBalloon(ToolWindowId.MESSAGES_WINDOW, messageType, statusMessage);
}
CompilerManager.NOTIFICATION_GROUP.createNotification(_status == ExitStatus.UP_TO_DATE ? "Compilation: all files are up to date" : statusMessage, messageType).notify(myProject);
if (_status != ExitStatus.UP_TO_DATE && compileContext.getMessageCount(null) > 0) {
compileContext.addMessage(CompilerMessageCategory.INFORMATION, statusMessage, null, -1, -1);
}
}
}
final int errorCount = compileContext.getMessageCount(CompilerMessageCategory.ERROR);
final int warningCount = compileContext.getMessageCount(CompilerMessageCategory.WARNING);
final String statusMessage = createStatusMessage(_status, warningCount, errorCount);
final MessageType messageType = errorCount > 0 ? MessageType.ERROR : warningCount > 0 ? MessageType.WARNING : MessageType.INFO;
if (duration > ONE_MINUTE_MS) {
ToolWindowManager.getInstance(myProject).notifyByBalloon(ToolWindowId.MESSAGES_WINDOW, messageType, statusMessage);
}
CompilerManager.NOTIFICATION_GROUP.createNotification(_status == ExitStatus.UP_TO_DATE ? "Compilation: all files are up to date" : statusMessage, messageType).notify(myProject);
if (_status != ExitStatus.UP_TO_DATE && compileContext.getMessageCount(null) > 0) {
compileContext.addMessage(CompilerMessageCategory.INFORMATION, statusMessage, null, -1, -1);
}
if (callback != null) {
callback.finished(_status == ExitStatus.CANCELLED, errorCount, warningCount, compileContext);
finally {
if (callback != null) {
callback.finished(_status == ExitStatus.CANCELLED, errorCount, warningCount, compileContext);
}
}
}
}, ModalityState.NON_MODAL);
});
}
private void checkCachesVersion(final CompileContextImpl compileContext, final long currentVFSTimestamp) {
@@ -2316,10 +2315,10 @@ public class CompileDriver {
}
private boolean validateCompilerConfiguration(final CompileScope scope, boolean checkOutputAndSourceIntersection) {
if (useOutOfProcessBuild()) {
return true;
}
try {
if (useOutOfProcessBuild()) {
return true;
}
final Module[] scopeModules = scope.getAffectedModules()/*ModuleManager.getInstance(myProject).getModules()*/;
final List<String> modulesWithoutOutputPathSpecified = new ArrayList<String>();
boolean isProjectCompilePathSpecified = true;
java/debugger/impl/src/com/intellij/debugger/settings/CompoundRendererConfigurable.java
+16 -15
View File
@@ -102,21 +102,6 @@ public class CompoundRendererConfigurable implements UnnamedConfigurable {
myProject = JavaDebuggerSupport.getCurrentProject();
}
final JPanel panel = new JPanel(new GridBagLayout());
myClassNameField = new TextFieldWithBrowseButton(new ActionListener() {
public void actionPerformed(ActionEvent e) {
PsiClass psiClass = DebuggerUtils.getInstance()
.chooseClassDialog(DebuggerBundle.message("title.compound.renderer.configurable.choose.renderer.reference.type"), myProject);
if (psiClass != null) {
myClassNameField.setText(JVMNameUtil.getNonAnonymousClassName(psiClass));
}
}
});
myClassNameField.getTextField().addFocusListener(new FocusAdapter() {
public void focusLost(FocusEvent e) {
final String qName = myClassNameField.getText();
updateContext(qName);
}
});
myRbDefaultLabel = new JRadioButton(DebuggerBundle.message("label.compound.renderer.configurable.use.default.renderer"));
myRbExpressionLabel = new JRadioButton(DebuggerBundle.message("label.compound.renderer.configurable.use.expression"));
@@ -146,6 +131,22 @@ public class CompoundRendererConfigurable implements UnnamedConfigurable {
myRbListChildrenRenderer.addItemListener(updateListener);
myRbExpressionChildrenRenderer.addItemListener(updateListener);
myClassNameField = new TextFieldWithBrowseButton(new ActionListener() {
public void actionPerformed(ActionEvent e) {
PsiClass psiClass = DebuggerUtils.getInstance()
.chooseClassDialog(DebuggerBundle.message("title.compound.renderer.configurable.choose.renderer.reference.type"), myProject);
if (psiClass != null) {
myClassNameField.setText(JVMNameUtil.getNonAnonymousClassName(psiClass));
}
}
});
myClassNameField.getTextField().addFocusListener(new FocusAdapter() {
public void focusLost(FocusEvent e) {
final String qName = myClassNameField.getText();
updateContext(qName);
}
});
panel.add(new JLabel(DebuggerBundle.message("label.compound.renderer.configurable.apply.to")),
new GridBagConstraints(0, GridBagConstraints.RELATIVE, 1, 1, 1.0, 0.0, GridBagConstraints.NORTHWEST, GridBagConstraints.NONE,
new Insets(0, 0, 0, 0), 0, 0));
java/execution/impl/src/com/intellij/compiler/options/CompileStepBeforeRun.java
+13 -11
View File
@@ -23,8 +23,6 @@ import com.intellij.execution.configurations.RunConfigurationBase;
import com.intellij.execution.configurations.RunProfileWithCompileBeforeLaunchOption;
import com.intellij.execution.remote.RemoteConfiguration;
import com.intellij.openapi.actionSystem.DataContext;
import com.intellij.openapi.application.ApplicationManager;
import com.intellij.openapi.application.ModalityState;
import com.intellij.openapi.compiler.CompileContext;
import com.intellij.openapi.compiler.CompileScope;
import com.intellij.openapi.compiler.CompileStatusNotification;
@@ -34,6 +32,7 @@ import com.intellij.openapi.module.Module;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.util.IconLoader;
import com.intellij.openapi.util.Key;
import com.intellij.openapi.util.Ref;
import com.intellij.util.concurrency.Semaphore;
import org.jetbrains.annotations.NonNls;
import org.jetbrains.annotations.NotNull;
@@ -109,20 +108,21 @@ public class CompileStepBeforeRun extends BeforeRunTaskProvider<CompileStepBefor
}
final RunProfileWithCompileBeforeLaunchOption runConfiguration = (RunProfileWithCompileBeforeLaunchOption)configuration;
final Semaphore done = new Semaphore();
final boolean[] result = new boolean[1];
final Ref<Boolean> result = new Ref<Boolean>(Boolean.FALSE);
try {
final Semaphore done = new Semaphore();
done.down();
final CompileStatusNotification callback = new CompileStatusNotification() {
public void finished(final boolean aborted, final int errors, final int warnings, CompileContext compileContext) {
if (errors == 0 && !aborted) {
result[0] = true;
result.set(Boolean.TRUE);
}
done.up();
}
};
ApplicationManager.getApplication().invokeAndWait(new Runnable() {
SwingUtilities.invokeAndWait(new Runnable() {
public void run() {
CompileScope scope;
final CompilerManager compilerManager = CompilerManager.getInstance(myProject);
@@ -147,20 +147,22 @@ public class CompileStepBeforeRun extends BeforeRunTaskProvider<CompileStepBefor
}
if (!myProject.isDisposed()) {
done.down();
scope.putUserData(RUN_CONFIGURATION, configuration);
scope.putUserData(RUN_CONFIGURATION_TYPE_ID, configuration.getType().getId());
compilerManager.make(scope, callback);
}
else {
done.up();
}
}
}, ModalityState.NON_MODAL);
});
done.waitFor();
}
catch (Exception e) {
return false;
}
done.waitFor();
return result[0];
return result.get();
}
public boolean isConfigurable() {
java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/CreateClassFromNewFix.java
+12 -5
View File
@@ -1,5 +1,5 @@
/*
* Copyright 2000-2009 JetBrains s.r.o.
* Copyright 2000-2012 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -92,7 +92,7 @@ public class CreateClassFromNewFix extends CreateFromUsageBaseFix {
final Project project = aClass.getProject();
if (argList != null && argList.getExpressions().length > 0) {
PsiMethod constructor = elementFactory.createConstructor();
constructor = (PsiMethod) aClass.add(constructor);
constructor = (PsiMethod)aClass.add(constructor);
TemplateBuilderImpl templateBuilder = new TemplateBuilderImpl(aClass);
CreateFromUsageUtils.setupMethodParameters(constructor, templateBuilder, argList, getTargetSubstitutor(newExpression));
@@ -120,7 +120,8 @@ public class CreateClassFromNewFix extends CreateFromUsageBaseFix {
};
if (ApplicationManager.getApplication().isUnitTestMode()) {
runnable.run();
} else {
}
else {
ApplicationManager.getApplication().invokeLater(runnable);
}
}
@@ -136,7 +137,7 @@ public class CreateClassFromNewFix extends CreateFromUsageBaseFix {
PsiMethod supConstructor = null;
PsiClass superClass = targetClass.getSuperClass();
if (superClass != null && !"java.lang.Object".equals(superClass.getQualifiedName()) &&
!"java.lang.Enum".equals(superClass.getQualifiedName())) {
!"java.lang.Enum".equals(superClass.getQualifiedName())) {
PsiMethod[] constructors = superClass.getConstructors();
boolean hasDefaultConstructor = false;
@@ -145,7 +146,8 @@ public class CreateClassFromNewFix extends CreateFromUsageBaseFix {
hasDefaultConstructor = true;
supConstructor = null;
break;
} else {
}
else {
supConstructor = superConstructor;
}
}
@@ -269,4 +271,9 @@ public class CreateClassFromNewFix extends CreateFromUsageBaseFix {
public String getFamilyName() {
return QuickFixBundle.message("create.class.from.new.family");
}
@Override
protected boolean canBeTargetClass(PsiClass psiClass) {
return false;
}
}
java/java-tests/testData/inspection/redundantCast/IDEADEV25675/src/A.java
+6
View File
@@ -6,4 +6,10 @@ public class Test {
public void bar(String[] array) {
((Object[]) array)[0] = new Object();
}
public Object obj;
public static void setObjValueInArray(Test t, Object val) {
t.obj = new Object[1];
((Object[])t.obj)[0] = val;
}
}
java/openapi/src/com/intellij/psi/util/RedundantCastUtil.java
+5 -5
View File
@@ -443,8 +443,8 @@ public class RedundantCastUtil {
PsiTypeElement typeElement = typeCast.getCastType();
if (typeElement == null) return;
PsiType castTo = typeElement.getType();
PsiType opType = typeCast.getOperand().getType();
final PsiType castTo = typeElement.getType();
final PsiType opType = typeCast.getOperand().getType();
if (opType == null) return;
if (parent instanceof PsiReferenceExpression) {
if (castTo instanceof PsiClassType && opType instanceof PsiPrimitiveType) return; //explicit boxing
@@ -460,8 +460,8 @@ public class RedundantCastUtil {
}
}
if (someWhereAtTheLeftSideOfAssignment(parent)) {
if (TypeConversionUtil.isAssignable(opType, castTo, false)) {
if (arrayAccessAtTheLeftSideOfAssignment(parent)) {
if (TypeConversionUtil.isAssignable(opType, castTo, false) && opType.getArrayDimensions() == castTo.getArrayDimensions()) {
addToResults(typeCast);
}
}
@@ -472,7 +472,7 @@ public class RedundantCastUtil {
}
}
private static boolean someWhereAtTheLeftSideOfAssignment(PsiElement element) {
private static boolean arrayAccessAtTheLeftSideOfAssignment(PsiElement element) {
PsiAssignmentExpression assignment = PsiTreeUtil.getParentOfType(element, PsiAssignmentExpression.class, false, PsiMember.class);
if (assignment == null) return false;
PsiExpression lExpression = assignment.getLExpression();