Update icon

Author: ice1000

src/com/intellij/devkt/json/_JsonLexer.flex renamed to grammar/_JsonLexer.flex

@@ -9,13 +9,21 @@
 import org.jetbrains.kotlin.com.intellij.psi.PsiErrorElement;
 import org.jetbrains.kotlin.com.intellij.psi.tree.IElementType;
 
+import javax.swing.*;
+
 public class Json<T> extends ExtendedDevKtLanguage<T> {
 	@NotNull
 	@Override
 	public String getLineCommentStart() {
 		return "//";
 	}
 
+	@Override
+	public @NotNull
+	Icon getIcon() {
+		return JsonFileType.INSTANCE.getIcon();
+	}
+
 	public Json() {
 		super(JsonLanguage.INSTANCE, new JsonParserDefinition());
 	}
@@ -30,9 +38,9 @@ public void annotate(PsiElement psiElement, AnnotationHolder<? super T> annotati
 		if (psiElement instanceof PsiErrorElement) annotationHolder.highlight(psiElement, colorScheme.getUnknown());
 	}
 
-	@Nullable
 	@Override
-	public T attributesOf(IElementType iElementType, ColorScheme<? extends T> colorScheme) {
+	public @Nullable
+	T attributesOf(IElementType iElementType, ColorScheme<? extends T> colorScheme) {
 		if (iElementType == JsonElementTypes.LINE_COMMENT) return colorScheme.getLineComments();
 		else if (iElementType == JsonElementTypes.BLOCK_COMMENT) return colorScheme.getBlockComments();
 		else if (iElementType == JsonElementTypes.NUMBER) return colorScheme.getNumbers();

res/icon/json@2x_dark.png

@@ -1,8 +1,7 @@
 package com.intellij.devkt.json;
 
+import org.ice1000.devkt.openapi.ui.IconLoader;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-import org.jetbrains.kotlin.com.intellij.icons.AllIcons;
 import org.jetbrains.kotlin.com.intellij.openapi.fileTypes.LanguageFileType;
 
 import javax.swing.*;
@@ -11,35 +10,36 @@
  * @author Mikhail Golubev
  */
 public class JsonFileType extends LanguageFileType {
-	public static final JsonFileType INSTANCE = new JsonFileType();
+	public static final @NotNull
+	JsonFileType INSTANCE = new JsonFileType();
 	public static final String DEFAULT_EXTENSION = "json";
+	private Icon icon = IconLoader.getIcon("/icon/json_dark.png");
 
 	public JsonFileType() {
 		super(JsonLanguage.INSTANCE);
 	}
 
-	@NotNull
 	@Override
-	public String getName() {
+	public @NotNull
+	String getName() {
 		return "JSON";
 	}
 
-	@NotNull
 	@Override
-	public String getDescription() {
+	public @NotNull
+	String getDescription() {
 		return "JSON files";
 	}
 
-	@NotNull
 	@Override
-	public String getDefaultExtension() {
+	public @NotNull
+	String getDefaultExtension() {
 		return DEFAULT_EXTENSION;
 	}
 
-	@Nullable
 	@Override
-	public Icon getIcon() {
-		// TODO: add JSON icon instead
-		return AllIcons.FileTypes.Json;
+	public @NotNull
+	Icon getIcon() {
+		return icon;
 	}
 }

res/icon/json_dark.png

@@ -1,6 +1,6 @@
 package com.intellij.devkt.json;
 
-import org.jetbrains.annotations.Nullable;
+import org.jetbrains.annotations.NotNull;
 import org.jetbrains.kotlin.com.intellij.lang.Language;
 import org.jetbrains.kotlin.com.intellij.openapi.fileTypes.LanguageFileType;
 
@@ -11,9 +11,9 @@ private JsonLanguage() {
 		super("JSON", "application/json", "application/vnd.api+json", "application/hal+json");
 	}
 
-	@Nullable
 	@Override
-	public LanguageFileType getAssociatedFileType() {
+	public @NotNull
+	LanguageFileType getAssociatedFileType() {
 		return JsonFileType.INSTANCE;
 	}