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 remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Dmitry Trofimov
2015-07-14 17:03:26 +02:00
parent be1b58d418 1ef83effc7
commit 744fa02a78
4 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
community-tests/src/tests/testGroups.properties
+4
View File
@@ -87,6 +87,10 @@ com.android.tools.idea.wizard.DynamicWizardPathTest
com.android.tools.idea.wizard.DynamicWizardStepTest
com.android.tools.idea.rendering.FlagManagerTest
com.android.tools.idea.rendering.ResourceFolderRepositoryTest
com.android.tools.idea.javadoc.AndroidJavaDocRendererTest
com.android.tools.idea.editors.strings.StringResourceDataTest
com.android.tools.idea.rendering.ClassConverterTest
com.android.tools.idea.gradle.service.notification.errors.UnknownHostErrorHandlerTest
[GRADLE_INTEGRATION_TESTS]
org.jetbrains.plugins.gradle.importing.*
java/debugger/impl/src/com/intellij/debugger/ui/impl/FrameVariablesTree.java
+7 -6
View File
@@ -42,10 +42,7 @@ import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.editor.Document;
import com.intellij.openapi.fileEditor.FileDocumentManager;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.util.Computable;
import com.intellij.openapi.util.Pair;
import com.intellij.openapi.util.Ref;
import com.intellij.openapi.util.TextRange;
import com.intellij.openapi.util.*;
import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.psi.*;
import com.intellij.psi.util.PsiTreeUtil;
@@ -625,8 +622,12 @@ public class FrameVariablesTree extends DebuggerTree {
if (myVisibleLocals.contains(var.getName())) {
myVars.add(var.getName());
}
else if (var instanceof PsiLocalVariable) {
myExpressions.add(new TextWithImportsImpl(reference));
else {
// fix for variables used in inner classes
if (!Comparing.equal(PsiTreeUtil.getParentOfType(reference, PsiClass.class),
PsiTreeUtil.getParentOfType(var, PsiClass.class))) {
myExpressions.add(new TextWithImportsImpl(reference));
}
}
}
}
plugins/coverage/coverage.iml
+1 -1
View File
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<module relativePaths="true" type="JAVA_MODULE" version="4">
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_5" inherit-compiler-output="true">
<component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
plugins/gradle/tooling-extension-impl/testSources/org/jetbrains/plugins/gradle/tooling/builder/AbstractModelBuilderTest.java
+1 -1
View File
@@ -66,7 +66,7 @@ public abstract class AbstractModelBuilderTest {
public static final Object[][] SUPPORTED_GRADLE_VERSIONS = {
{"1.9"}, {"1.10"}, {"1.11"}, {"1.12"},
{"2.0"}, {"2.1"}, {"2.2"} , {"2.3"}
{"2.0"}, {"2.1"}, {"2.2"} , {"2.3"}, {"2.4"}, {"2.5"}
};
public static final String BASE_GRADLE_VERSION = String.valueOf(SUPPORTED_GRADLE_VERSIONS[SUPPORTED_GRADLE_VERSIONS.length - 1][0]);