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

WEB-32504 Inspections: remove JSON-related options from the JSON5 inspection

Browse Source 
+ join JSON and JSON5 under the same group, because most inspections are applicable to both
This commit is contained in:
Anton Lobov
2018-04-25 16:51:36 +02:00
parent 583f2eec9e
commit 61942cd63d
3 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
json/src/com/intellij/json/JsonBundle.properties
+1 -2
View File
@@ -8,8 +8,7 @@ syntax.error.illegal.unicode.escape.sequence=Illegal unicode escape sequence
syntax.error.illegal.floating.point.literal=Illegal floating point literal
# Inspections
json.inspection.group=JSON
json.inspection5.group=JSON/JSON5
json.inspection.group=JSON and JSON5
inspection.compliance.name=Compliance with JSON standard
inspection.compliance5.name=Compliance with JSON5 standard
json/src/com/intellij/json/json5/codeinsight/Json5StandardComplianceInspection.java
+9 -1
View File
@@ -5,6 +5,7 @@ import com.intellij.codeInspection.ProblemsHolder;
import com.intellij.json.JsonBundle;
import com.intellij.json.JsonDialectUtil;
import com.intellij.json.codeinsight.JsonStandardComplianceInspection;
import com.intellij.json.json5.Json5Language;
import com.intellij.json.psi.JsonLiteral;
import com.intellij.json.psi.JsonPsiUtil;
import com.intellij.json.psi.JsonReferenceExpression;
@@ -13,6 +14,8 @@ import com.intellij.psi.PsiElement;
import com.intellij.psi.PsiElementVisitor;
import org.jetbrains.annotations.NotNull;
import javax.swing.*;
public class Json5StandardComplianceInspection extends JsonStandardComplianceInspection {
@NotNull
@@ -23,10 +26,15 @@ public class Json5StandardComplianceInspection extends JsonStandardComplianceIns
@NotNull
@Override
public PsiElementVisitor buildVisitor(@NotNull final ProblemsHolder holder, boolean isOnTheFly) {
if (JsonDialectUtil.isStandardJson(holder.getFile())) return PsiElementVisitor.EMPTY_VISITOR;
if (!(JsonDialectUtil.getLanguage(holder.getFile()) instanceof Json5Language)) return PsiElementVisitor.EMPTY_VISITOR;
return new StandardJson5ValidatingElementVisitor(holder);
}
@Override
public JComponent createOptionsPanel() {
return null;
}
private class StandardJson5ValidatingElementVisitor extends StandardJsonValidatingElementVisitor {
public StandardJson5ValidatingElementVisitor(ProblemsHolder holder) {
super(holder);
platform/platform-resources/src/META-INF/JsonPlugin.xml
+1 -1
View File
@@ -66,7 +66,7 @@
enabledByDefault="true" level="ERROR"
implementationClass="com.intellij.json.codeinsight.JsonStandardComplianceInspection"/>
<localInspection language="JSON5" shortName="Json5StandardCompliance"
bundle="com.intellij.json.JsonBundle" key="inspection.compliance5.name" groupKey="json.inspection5.group"
bundle="com.intellij.json.JsonBundle" key="inspection.compliance5.name" groupKey="json.inspection.group"
enabledByDefault="true" level="ERROR"
implementationClass="com.intellij.json.json5.codeinsight.Json5StandardComplianceInspection"/>
<localInspection language="JSON" shortName="JsonDuplicatePropertyKeys"