From 61942cd63d92f182bc85641231b5bd27ae04774e Mon Sep 17 00:00:00 2001
From: Anton Lobov <Anton.Lobov@jetbrains.com>
Date: Wed, 25 Apr 2018 16:51:36 +0200
Subject: [PATCH] WEB-32504 Inspections: remove JSON-related options from the
 JSON5 inspection

+ join JSON and JSON5 under the same group, because most inspections are applicable to both
---
 json/src/com/intellij/json/JsonBundle.properties       |  3 +--
 .../codeinsight/Json5StandardComplianceInspection.java | 10 +++++++++-
 .../platform-resources/src/META-INF/JsonPlugin.xml     |  2 +-
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/json/src/com/intellij/json/JsonBundle.properties b/json/src/com/intellij/json/JsonBundle.properties
index 86dae41d32cf..dd5f374d0703 100644
--- a/json/src/com/intellij/json/JsonBundle.properties
+++ b/json/src/com/intellij/json/JsonBundle.properties
@@ -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
diff --git a/json/src/com/intellij/json/json5/codeinsight/Json5StandardComplianceInspection.java b/json/src/com/intellij/json/json5/codeinsight/Json5StandardComplianceInspection.java
index 9cee214f9984..c6cf3a9c2322 100644
--- a/json/src/com/intellij/json/json5/codeinsight/Json5StandardComplianceInspection.java
+++ b/json/src/com/intellij/json/json5/codeinsight/Json5StandardComplianceInspection.java
@@ -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);
diff --git a/platform/platform-resources/src/META-INF/JsonPlugin.xml b/platform/platform-resources/src/META-INF/JsonPlugin.xml
index 55668007229d..9902e2dcba7b 100644
--- a/platform/platform-resources/src/META-INF/JsonPlugin.xml
+++ b/platform/platform-resources/src/META-INF/JsonPlugin.xml
@@ -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"