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:
Eugene Kudelevsky
2011-03-11 21:06:32 +03:00
parent ebf57f4c93 feac213039
commit 7f04a45373
4 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/debugger/impl/src/com/intellij/debugger/ui/PositionHighlighter.java
+6 -4
View File
@@ -225,10 +225,12 @@ public class PositionHighlighter {
}
if (breakpoint instanceof BreakpointWithHighlighter) {
breakpoint.reload();
final SourcePosition sourcePosition = ((BreakpointWithHighlighter)breakpoint).getSourcePosition();
if (sourcePosition == null || sourcePosition.getLine() != lineIndex) {
eventsOutOfLine.add(eventDescriptor);
if (((BreakpointWithHighlighter)breakpoint).isVisible()) {
breakpoint.reload();
final SourcePosition sourcePosition = ((BreakpointWithHighlighter)breakpoint).getSourcePosition();
if (sourcePosition == null || sourcePosition.getLine() != lineIndex) {
eventsOutOfLine.add(eventDescriptor);
}
}
}
else {
java/java-impl/src/com/intellij/refactoring/introduceParameter/InplaceIntroduceParameterPopup.java
+3
View File
@@ -284,13 +284,16 @@ class InplaceIntroduceParameterPopup extends IntroduceParameterSettingsUI {
getReplaceFieldsWithGetters(), myMustBeFinal || myFinal, isGenerateDelegate(),
myParameterTypePointer.getType(),
parametersToRemove);
final boolean [] conflictsFound = new boolean[] {true};
processor.setPrepareSuccessfulSwingThreadCallback(new Runnable() {
@Override
public void run() {
conflictsFound[0] = false;
}
});
processor.run();
normalizeParameterIdxAccordingToRemovedParams(parametersToRemove);
success = !conflictsFound[0];
}
super.moveOffsetAfter(success);
}
plugins/groovy/src/org/jetbrains/plugins/groovy/highlighter/GroovyBraceMatcher.java
+3 -1
View File
@@ -23,6 +23,7 @@ import com.intellij.psi.TokenType;
import com.intellij.psi.tree.IElementType;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.plugins.groovy.GroovyFileType;
import org.jetbrains.plugins.groovy.lang.groovydoc.lexer.GroovyDocTokenTypes;
import org.jetbrains.plugins.groovy.lang.lexer.GroovyTokenTypes;
import org.jetbrains.plugins.groovy.lang.lexer.TokenSets;
@@ -60,7 +61,8 @@ public class GroovyBraceMatcher implements PairedBraceMatcher {
|| tokenType == GroovyTokenTypes.mRPAREN
|| tokenType == GroovyTokenTypes.mRBRACK
|| tokenType == GroovyTokenTypes.mRCURLY
|| tokenType == GroovyTokenTypes.mGSTRING_BEGIN;
|| tokenType == GroovyTokenTypes.mGSTRING_BEGIN
|| tokenType.getLanguage() != GroovyFileType.GROOVY_LANGUAGE;
}
public int getCodeConstructStart(PsiFile file, int openingBraceOffset) {
plugins/junit/src/com/intellij/execution/junit/JUnitConfigurationProducer.java
+2
View File
@@ -16,6 +16,7 @@
package com.intellij.execution.junit;
import com.intellij.execution.JavaExecutionUtil;
import com.intellij.execution.Location;
import com.intellij.execution.RunManagerEx;
import com.intellij.execution.RunnerAndConfigurationSettings;
@@ -55,6 +56,7 @@ public abstract class JUnitConfigurationProducer extends JavaRuntimeConfiguratio
((JUnitConfiguration)((RunManagerImpl)RunManagerEx.getInstanceEx(location.getProject()))
.getConfigurationTemplate(getConfigurationFactory())
.getConfiguration()).getConfigurationModule().getModule();
location = JavaExecutionUtil.stepIntoSingleClass(location);
final PsiElement element = location.getPsiElement();
final PsiClass testClass = JUnitUtil.getTestClass(element);
final PsiMethod testMethod = JUnitUtil.getTestMethod(element);