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

IDEA-222246 Inspection settings are not saved

Browse Source 
GitOrigin-RevId: 3b5861997ad435d6de53f6db34b9caa9963c5854
This commit is contained in:
Vladimir Krivosheev
2019-09-09 09:30:56 +00:00
committed by intellij-monorepo-bot
parent 1f0737b35b
commit e70639e30d
3 changed files with 20 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-tests/testSrc/com/intellij/codeInspection/ex/InspectionProfileTest.java
+14 -2
View File
@@ -591,8 +591,20 @@ public class InspectionProfileTest extends LightIdeaTestCase {
inspectionTool.CLASS = false;
});
String mergedText = "<profile version=\"1.0\">\n" +
" <option name=\"myName\" value=\"ToConvert\" />\n" +
"</profile>";
" <option name=\"myName\" value=\"ToConvert\" />\n" +
" <inspection_tool class=\"unused\" enabled=\"true\" level=\"WARNING\" enabled_by_default=\"true\">\n" +
" <option name=\"LOCAL_VARIABLE\" value=\"true\" />\n" +
" <option name=\"FIELD\" value=\"true\" />\n" +
" <option name=\"METHOD\" value=\"true\" />\n" +
" <option name=\"CLASS\" value=\"false\" />\n" +
" <option name=\"PARAMETER\" value=\"true\" />\n" +
" <option name=\"REPORT_PARAMETER_FOR_PUBLIC_METHODS\" value=\"true\" />\n" +
" <option name=\"ADD_MAINS_TO_ENTRIES\" value=\"true\" />\n" +
" <option name=\"ADD_APPLET_TO_ENTRIES\" value=\"true\" />\n" +
" <option name=\"ADD_SERVLET_TO_ENTRIES\" value=\"true\" />\n" +
" <option name=\"ADD_NONJAVA_TO_ENTRIES\" value=\"false\" />\n" +
" </inspection_tool>\n" +
"</profile>";
assertEquals(mergedText, serialize(profile));
}
platform/analysis-api/src/com/intellij/codeInspection/InspectionEP.java
+5 -3
View File
@@ -8,6 +8,7 @@ import com.intellij.diagnostic.PluginException;
import com.intellij.ide.plugins.IdeaPluginDescriptor;
import com.intellij.lang.Language;
import com.intellij.lang.LanguageExtensionPoint;
import com.intellij.openapi.application.ApplicationManager;
import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.extensions.ExtensionPointName;
import com.intellij.openapi.util.text.StringUtil;
@@ -25,6 +26,8 @@ import java.util.ResourceBundle;
* @see LocalInspectionEP
*/
public class InspectionEP extends LanguageExtensionPoint<InspectionProfileEntry> implements InspectionProfileEntry.DefaultNameProvider {
private static final Logger LOG = Logger.getInstance(InspectionEP.class);
/**
* @see GlobalInspectionTool
*/
@@ -185,11 +188,10 @@ public class InspectionEP extends LanguageExtensionPoint<InspectionProfileEntry>
return CommonBundle.message(resourceBundle, key);
}
private static final Logger LOG = Logger.getInstance("#com.intellij.codeInspection.InspectionEP");
@NotNull
public InspectionProfileEntry instantiateTool() {
InspectionProfileEntry entry = getInstance();
// must create a new instance for each invocation
InspectionProfileEntry entry = createInstance(ApplicationManager.getApplication());
entry.myNameProvider = this;
return entry;
}
platform/core-api/src/com/intellij/serviceContainer/BaseKeyedLazyInstance.java
+1 -6
View File
@@ -24,11 +24,6 @@ public abstract class BaseKeyedLazyInstance<T> implements PluginAware {
@NotNull
public final T getInstance() {
return getInstance(ApplicationManager.getApplication());
}
@NotNull
protected final T getInstance(@NotNull ComponentManager componentManager) {
T result = instance;
if (result != null) {
return result;
@@ -41,7 +36,7 @@ public abstract class BaseKeyedLazyInstance<T> implements PluginAware {
return result;
}
result = createInstance(componentManager);
result = createInstance(ApplicationManager.getApplication());
instance = result;
}
return result;