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:
Maxim.Mossienko
2015-01-14 12:51:50 +01:00
parent e546f26c22 1854a24555
commit 12c041b2cd
21 changed files with 144 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/NonProjectFileWritingAccessDialog.form
+2 -2
View File
@@ -22,7 +22,7 @@
</constraints>
<properties>
<selected value="true"/>
<text value="Unlock files"/>
<text value="I want to edit these files anyway"/>
</properties>
</component>
<component id="592c9" class="javax.swing.JRadioButton" binding="myUnlockAllButton" default-binding="true">
@@ -30,7 +30,7 @@
<grid row="1" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
</constraints>
<properties>
<text value="Unlock all non-project files in current session"/>
<text value="I want to edit any non-project file in the current session"/>
</properties>
</component>
</children>
platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/NonProjectFileWritingAccessDialog.java
+5 -1
View File
@@ -38,9 +38,13 @@ public class NonProjectFileWritingAccessDialog extends DialogWrapper {
myFileList.setCellRenderer(new FileListRenderer());
myFileList.setModel(new CollectionListModel<VirtualFile>(nonProjectFiles));
getOKAction().putValue(DEFAULT_ACTION, null);
getCancelAction().putValue(DEFAULT_ACTION, true);
init();
}
@Nullable
@Override
protected JComponent createCenterPanel() {
@@ -54,6 +58,6 @@ public class NonProjectFileWritingAccessDialog extends DialogWrapper {
}
protected String getHelpId() {
return "readOnlyHandler.nonProjectFilesDialog";
return "Non-Project_Files_Access_Dialog";
}
}
plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/InspectionGadgetsBundle.properties
+2 -1
View File
@@ -2135,7 +2135,8 @@ utility.class.code.can.be.enum.quickfix=Convert to 'enum'
non.public.clone.display.name='clone()' method not 'public'
non.public.clone.problem.descriptor=<code>#ref()</code> method not 'public' #loc
only.warn.on.public.clone.methods=Only warn on 'public' clone methods
only.warn.on.protected.clone.methods=Only warn on 'protected' clone methods
clone.returns.class.type.display.name='clone()' should have return type equal to the class it contains
clone.returns.class.type.problem.descriptor=''clone()'' should have return type ''{0}'' #loc
clone.returns.class.type.quickfix=Change return type to '{0}'
clone.returns.class.type.quickfix=Change return type to ''{0}''
clone.returns.class.type.family.quickfix=Change return type to class type
plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/abstraction/TypeMayBeWeakenedInspection.java
+3 -2
View File
@@ -1,5 +1,5 @@
/*
* Copyright 2006-2014 Bas Leijdekkers
* Copyright 2006-2015 Bas Leijdekkers
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -18,6 +18,7 @@ package com.siyeh.ig.abstraction;
import com.intellij.codeInsight.daemon.impl.analysis.JavaHighlightUtil;
import com.intellij.codeInspection.ProblemDescriptor;
import com.intellij.codeInspection.ui.MultipleCheckboxOptionsPanel;
import com.intellij.openapi.application.ApplicationManager;
import com.intellij.openapi.project.Project;
import com.intellij.psi.*;
import com.intellij.psi.codeStyle.JavaCodeStyleManager;
@@ -294,7 +295,7 @@ public class TypeMayBeWeakenedInspection extends BaseInspection {
@Override
public void visitMethod(PsiMethod method) {
super.visitMethod(method);
if (isOnTheFly() && !method.hasModifierProperty(PsiModifier.PRIVATE)) {
if (isOnTheFly() && !method.hasModifierProperty(PsiModifier.PRIVATE) && !ApplicationManager.getApplication().isUnitTestMode()) {
// checking methods with greater visibility is too expensive.
// for error checking in the editor
return;
plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/cloneable/CloneDeclaresCloneNotSupportedInspection.java
+9 -9
View File
@@ -39,7 +39,7 @@ import javax.swing.*;
public class CloneDeclaresCloneNotSupportedInspection extends BaseInspection {
private boolean onlyWarnOnPublicClone = true;
private boolean onlyWarnOnProtectedClone = true;
@Override
@NotNull
@@ -67,16 +67,16 @@ public class CloneDeclaresCloneNotSupportedInspection extends BaseInspection {
@Nullable
@Override
public JComponent createOptionsPanel() {
return new SingleCheckboxOptionsPanel(InspectionGadgetsBundle.message("only.warn.on.public.clone.methods"),
this, "onlyWarnOnPublicClone");
return new SingleCheckboxOptionsPanel(InspectionGadgetsBundle.message("only.warn.on.protected.clone.methods"),
this, "onlyWarnOnProtectedClone");
}
@Override
public void readSettings(@NotNull Element node) throws InvalidDataException {
super.readSettings(node);
for (Element option : node.getChildren("option")) {
if ("onlyWarnOnPublicClone".equals(option.getAttributeValue("name"))) {
onlyWarnOnPublicClone = Boolean.parseBoolean(option.getAttributeValue("value"));
if ("onlyWarnOnProtectedClone".equals(option.getAttributeValue("name"))) {
onlyWarnOnProtectedClone = Boolean.parseBoolean(option.getAttributeValue("value"));
}
}
}
@@ -84,9 +84,9 @@ public class CloneDeclaresCloneNotSupportedInspection extends BaseInspection {
@Override
public void writeSettings(@NotNull Element node) throws WriteExternalException {
super.writeSettings(node);
if (!onlyWarnOnPublicClone) {
node.addContent(new Element("option").setAttribute("name", "onlyWarnOnPublicClone")
.setAttribute("value", String.valueOf(onlyWarnOnPublicClone)));
if (!onlyWarnOnProtectedClone) {
node.addContent(new Element("option").setAttribute("name", "onlyWarnOnProtectedClone")
.setAttribute("value", String.valueOf(onlyWarnOnProtectedClone)));
}
}
@@ -131,7 +131,7 @@ public class CloneDeclaresCloneNotSupportedInspection extends BaseInspection {
if (method.hasModifierProperty(PsiModifier.FINAL)) {
return;
}
if (onlyWarnOnPublicClone && !method.hasModifierProperty(PsiModifier.PUBLIC)) {
if (onlyWarnOnProtectedClone && method.hasModifierProperty(PsiModifier.PUBLIC)) {
return;
}
final PsiClass containingClass = method.getContainingClass();
plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/dependency/CyclicClassDependencyInspection.java
+4 -11
View File
@@ -1,5 +1,5 @@
/*
* Copyright 2006-2013 Dave Griffith, Bas Leijdekkers
* Copyright 2006-2015 Dave Griffith, Bas Leijdekkers
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -52,7 +52,7 @@ public class CyclicClassDependencyInspection extends BaseGlobalInspection {
}
final RefClass refClass = (RefClass)refEntity;
final PsiClass aClass = refClass.getElement();
if (aClass == null || aClass.getContainingClass() != null) {
if (aClass == null || aClass.getContainingClass() != null || aClass instanceof PsiAnonymousClass) {
return null;
}
final Set<RefClass> dependencies = DependencyUtils.calculateTransitiveDependenciesForClass(refClass);
@@ -79,15 +79,8 @@ public class CyclicClassDependencyInspection extends BaseGlobalInspection {
errorString = InspectionGadgetsBundle.message("cyclic.class.dependency.problem.descriptor",
refEntity.getName(), Integer.valueOf(numMutualDependents));
}
final PsiElement anchor;
if (aClass instanceof PsiAnonymousClass) {
final PsiAnonymousClass anonymousClass = (PsiAnonymousClass)aClass;
anchor = anonymousClass.getBaseClassReference();
}
else {
anchor = aClass.getNameIdentifier();
if (anchor == null) return null;
}
final PsiElement anchor = aClass.getNameIdentifier();
if (anchor == null) return null;
return new CommonProblemDescriptor[]{
inspectionManager.createProblemDescriptor(anchor, errorString, (LocalQuickFix)null,
ProblemHighlightType.GENERIC_ERROR_OR_WARNING, false)
plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/psiutils/WeakestTypeFinder.java
+10 -4
View File
@@ -1,5 +1,5 @@
/*
* Copyright 2008-2014 Bas Leijdekkers
* Copyright 2008-2015 Bas Leijdekkers
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -155,11 +155,17 @@ public class WeakestTypeFinder {
checkClass(javaLangIterableClass, weakestTypeClasses);
}
else if (referenceParent instanceof PsiReturnStatement) {
final PsiMethod containingMethod = PsiTreeUtil.getParentOfType(referenceParent, PsiMethod.class);
if (containingMethod == null) {
final PsiElement owner = PsiTreeUtil.getParentOfType(referenceParent, PsiMethod.class, PsiLambdaExpression.class);
final PsiType type;
if (owner instanceof PsiMethod) {
type = ((PsiMethod)owner).getReturnType();
}
else if (owner instanceof PsiLambdaExpression) {
type = LambdaUtil.getFunctionalInterfaceReturnType((PsiLambdaExpression)owner);
}
else {
return Collections.emptyList();
}
final PsiType type = containingMethod.getReturnType();
if (!checkType(type, weakestTypeClasses)) {
return Collections.emptyList();
}
plugins/InspectionGadgets/src/inspectionDescriptions/CloneDeclaresCloneNotSupported.html
+2 -2
View File
@@ -8,9 +8,9 @@ prohibit cloning will not be able to do so in the standard way. This inspection
or <b>clone()</b> methods on <b>final</b> classes.
<!-- tooltip end -->
<p>
Use the checkbox below to indicate if this inspection should only warn on <b>public</b> methods.
Use the checkbox below to indicate if this inspection should only warn on <b>protected</b> methods.
In <i>Effective Java, Second Edition</i> (but not in the first edition) it is recommended to omit the <b>CloneNotSupportedException</b>
declaration, because methods that don't throw checked exceptions are easier to use.
declaration on <b>public</b> methods, because methods that don't throw checked exceptions are easier to use.
<p>
</body>
plugins/InspectionGadgets/test/com/siyeh/igtest/abstraction/weaken_type/Lambda.java
+23
View File
@@ -0,0 +1,23 @@
package com.siyeh.igtest.abstraction.weaken_type;
import java.util.function.Supplier;
public interface Lambda {
int count();
static Lambda newWeaken(int value) {
return new Lambda() {
@Override
public int count() {
return value;
}
};
}
static Supplier<Lambda> newSupplier() {
return () -> {
return Lambda.newWeaken(0);
};
}
}
plugins/InspectionGadgets/test/com/siyeh/igtest/cloneable/clone_declares_clone_not_supported/CloneDeclaresCloneNonSupportedException.java
+11 -1
View File
@@ -8,7 +8,7 @@ public class CloneDeclaresCloneNonSupportedException implements Cloneable
}
public Object clone()
protected Object <warning descr="'clone()' does not declare 'CloneNotSupportedException'">clone</warning>()
{
try
{
@@ -34,3 +34,13 @@ class Child extends CloneDeclaresCloneNonSupportedException {
return super.clone();
}
}
class NoWarnOnPublic implements Cloneable {
public Object clone() {
try {
return super.clone();
} catch (CloneNotSupportedException e) {
throw new AssertionError(e);
}
}
}
plugins/InspectionGadgets/test/com/siyeh/igtest/cloneable/clone_declares_clone_not_supported/expected.xml
-9
View File
@@ -1,9 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<problems>
<problem>
<file>CloneDeclaresCloneNonSupportedException.java</file>
<line>11</line>
<problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">'clone()' does not declare 'CloneNotSupportedException'</problem_class>
<description>&lt;code&gt;clone()&lt;/code&gt; does not declare 'CloneNotSupportedException'</description>
</problem>
</problems>
plugins/InspectionGadgets/test/com/siyeh/igtest/dependency/cyclic_class_dependency/expected.xml
-7
View File
@@ -1,12 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<problems>
<problem>
<file>Cyclic.java</file>
<line>9</line>
<problem_class severity="WARNING" attribute_key="WARNING_ATTRIBUTES">Cyclic class dependency</problem_class>
<description>Class 'anonymous (java.lang.Object)' is cyclically dependent on 3 other classes</description>
</problem>
<problem>
<file>Cyclic.java</file>
<line>17</line>
plugins/InspectionGadgets/test/com/siyeh/igtest/dependency/cyclic_class_dependency/src/Cyclic.java
+15
View File
@@ -27,3 +27,18 @@ interface FiveOClock {
}
interface Coffee extends FiveOClock {}
enum MyEnum {
ONE {
public int value() {
return 0;
}
},
TWO {
public int value() {
return ONE.value();
}
};
abstract int value();
}
plugins/InspectionGadgets/testsrc/com/siyeh/ig/abstraction/TypeMayBeWeakenedInspectionTest.java
+6
View File
@@ -9,6 +9,7 @@ public class TypeMayBeWeakenedInspectionTest extends LightInspectionTestCase {
public void testTypeMayBeWeakened() { doTest(); }
public void testNumberAdderDemo() { doTest(); }
public void testAutoClosableTest() { doTest(); }
public void testLambda() { doTest(); }
@Override
protected String[] getEnvironmentClasses() {
@@ -33,6 +34,11 @@ public class TypeMayBeWeakenedInspectionTest extends LightInspectionTestCase {
"@FunctionalInterface " +
"public interface Function<T, R> {" +
" R apply(T t);" +
"}",
"package java.util.function;\n" +
"@FunctionalInterface\n" +
"public interface Supplier<T> {\n" +
" T get();\n" +
"}"
};
}
plugins/InspectionGadgets/testsrc/com/siyeh/ig/cloneable/CloneDeclaresCloneNotSupportedInspectionTest.java
+12 -4
View File
@@ -1,10 +1,18 @@
package com.siyeh.ig.cloneable;
import com.siyeh.ig.IGInspectionTestCase;
import com.intellij.codeInspection.InspectionProfileEntry;
import com.siyeh.ig.LightInspectionTestCase;
import org.jetbrains.annotations.Nullable;
public class CloneDeclaresCloneNotSupportedInspectionTest extends IGInspectionTestCase {
public class CloneDeclaresCloneNotSupportedInspectionTest extends LightInspectionTestCase {
public void test() throws Exception {
doTest("com/siyeh/igtest/cloneable/clone_declares_clone_not_supported", new CloneDeclaresCloneNotSupportedInspection());
public void testCloneDeclaresCloneNonSupportedException() {
doTest();
}
@Nullable
@Override
protected InspectionProfileEntry getInspection() {
return new CloneDeclaresCloneNotSupportedInspection();
}
}
plugins/java-decompiler/engine/src/org/jetbrains/java/decompiler/modules/code/DeadCodeHelper.java
+2 -1
View File
@@ -1,5 +1,5 @@
/*
* Copyright 2000-2014 JetBrains s.r.o.
* Copyright 2000-2015 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.
@@ -416,6 +416,7 @@ public class DeadCodeHelper {
if (sameRanges) {
seq.addSequence(next.getSeq());
block.getInstrOldOffsets().addAll(next.getInstrOldOffsets());
next.getSeq().clear();
removeEmptyBlock(graph, next, true);
plugins/java-decompiler/engine/testData/results/TestClassLoop.dec
+8 -2
View File
@@ -16,7 +16,7 @@ public class TestClassLoop {
return;
}
} finally {
System.out.println("1");
System.out.println("1");// 38
}
}
}
@@ -30,7 +30,7 @@ public class TestClassLoop {
System.out.println("1");// 49
break;
} finally {
if(var0) {
if(var0) {// 52
System.out.println("3");// 53
continue;
}
@@ -54,6 +54,9 @@ class 'pkg/TestClassLoop' {
4 10
d 10
f 14
26 18
27 18
2a 18
}
method 'testFinallyContinue ()V' {
@@ -64,6 +67,7 @@ class 'pkg/TestClassLoop' {
e 29
11 29
13 29
26 32
2a 33
2d 33
2f 33
@@ -74,6 +78,8 @@ Lines mapping:
23 <-> 6
29 <-> 11
33 <-> 15
38 <-> 19
45 <-> 25
49 <-> 30
52 <-> 33
53 <-> 34
plugins/java-decompiler/engine/testData/results/TestClassSimpleBytecodeMapping.dec
+9 -2
View File
@@ -22,9 +22,9 @@ public class TestClassSimpleBytecodeMapping {
try {
Integer.parseInt(var1);// 34
} catch (Exception var6) {
System.out.println(var6);
System.out.println(var6);// 36
} finally {
System.out.println("Finally");
System.out.println("Finally");// 38
}
}
@@ -80,6 +80,11 @@ class 'pkg/TestClassSimpleBytecodeMapping' {
method 'test2 (Ljava/lang/String;)V' {
1 22
11 24
15 24
23 26
24 26
27 26
}
method 'run (Ljava/lang/Runnable;)V' {
@@ -114,6 +119,8 @@ Lines mapping:
27 <-> 16
28 <-> 17
34 <-> 23
36 <-> 25
38 <-> 27
44 <-> 44
49 <-> 33
54 <-> 38
plugins/java-decompiler/engine/testData/results/TestClassVar.dec
+4 -1
View File
@@ -9,7 +9,7 @@ public class TestClassVar {
try {
System.out.println();// 29
} finally {
if(this.field_boolean) {
if(this.field_boolean) {// 32
System.out.println();// 33
}
@@ -46,6 +46,8 @@ class 'pkg/TestClassVar' {
3 7
8 9
b 9
1f 11
20 11
26 12
29 12
}
@@ -73,6 +75,7 @@ class 'pkg/TestClassVar' {
Lines mapping:
26 <-> 8
29 <-> 10
32 <-> 12
33 <-> 13
40 <-> 22
45 <-> 26
plugins/java-decompiler/engine/testData/results/TestSynchronizedMapping.dec
+1
View File
@@ -16,6 +16,7 @@ class 'pkg/TestSynchronizedMapping' {
method 'test (I)I' {
3 4
5 5
a 5
}
method 'test2 (Ljava/lang/String;)V' {
plugins/java-decompiler/engine/testData/results/TestTryCatchFinally.dec
+16 -3
View File
@@ -11,7 +11,7 @@ public class TestTryCatchFinally {
;
}
} finally {
System.out.println("finally");
System.out.println("finally");// 34
}
}
@@ -31,9 +31,9 @@ public class TestTryCatchFinally {
int var2 = Integer.parseInt(var1);// 51
return var2;
} catch (Exception var6) {
System.out.println("Error" + var6);
System.out.println("Error" + var6);// 53
} finally {
System.out.println("Finally");
System.out.println("Finally");// 55
}
return -1;
@@ -48,6 +48,9 @@ class 'pkg/TestTryCatchFinally' {
14 8
17 8
19 8
2b 13
2d 13
30 13
}
method 'foo (I)I' {
@@ -63,15 +66,25 @@ class 'pkg/TestTryCatchFinally' {
method 'test (Ljava/lang/String;)I' {
1 30
4 30
10 33
1a 33
23 33
26 33
34 35
35 35
38 35
}
}
Lines mapping:
24 <-> 6
27 <-> 9
34 <-> 14
39 <-> 20
40 <-> 21
41 <-> 22
42 <-> 23
45 <-> 25
51 <-> 31
53 <-> 34
55 <-> 36