updated API of code areas.

Author: JavaSaBr

src/main/java/com/ss/editor/ui/control/code/BaseCodeArea.java

@@ -20,44 +20,37 @@
  */
 public class BaseCodeArea extends CodeArea {
 
-    @NotNull
-    protected static final String CLASS_KEYWORD = "KEYWORD";
+    protected static final String CSS_KEYWORD = "keyword";
+    protected static final String CSS_VALUE_TYPE = "value-type";
+    protected static final String CSS_VALUE_VALUE = "value-value";
+    protected static final String CSS_PAREN = "paren";
+    protected static final String CSS_BRACE = "brace";
+    protected static final String CSS_BRACKET = "bracket";
+    protected static final String CSS_SEMICOLON = "semicolon";
+    protected static final String CSS_STRING = "string";
+    protected static final String CSS_COMMENT = "comment";
 
-    @NotNull
+    protected static final String CLASS_KEYWORD = "KEYWORD";
     protected static final String CLASS_VALUE_TYPE = "VALUETYPE";
-
-    @NotNull
     protected static final String CLASS_VALUE_VALUE = "VALUEVALUE";
-
-    @NotNull
     protected static final String CLASS_PAREN = "PAREN";
-
-    @NotNull
     protected static final String CLASS_BRACE = "BRACE";
-
-    @NotNull
     protected static final String CLASS_BRACKET = "BRACKET";
-
-    @NotNull
     protected static final String CLASS_SEMICOLON = "SEMICOLON";
-
-    @NotNull
     protected static final String CLASS_STRING = "STRING";
-
-    @NotNull
     protected static final String CLASS_COMMENT = "COMMENT";
 
     @NotNull
     protected static final String[][] AVAILABLE_CLASSES = {
-            {CLASS_KEYWORD, "keyword"},
-            {CLASS_VALUE_TYPE, "value-type"},
-            {CLASS_VALUE_VALUE, "value-value"},
-            {CLASS_PAREN, "paren"},
-            {CLASS_BRACE, "brace"},
-            {CLASS_BRACKET, "bracket"},
-            {CLASS_SEMICOLON, "semicolon"},
-            {CLASS_STRING, "string"},
-            {CLASS_COMMENT, "comment"},
+            {CLASS_KEYWORD, CSS_KEYWORD},
+            {CLASS_VALUE_TYPE, CSS_VALUE_TYPE},
+            {CLASS_VALUE_VALUE, CSS_VALUE_VALUE},
+            {CLASS_PAREN, CSS_PAREN},
+            {CLASS_BRACE, CSS_BRACE},
+            {CLASS_BRACKET, CSS_BRACKET},
+            {CLASS_SEMICOLON, CSS_SEMICOLON},
+            {CLASS_STRING, CSS_STRING},
+            {CLASS_COMMENT, CSS_COMMENT},
     };
 
     protected static final String PAREN_PATTERN = "\\(|\\)";
@@ -67,11 +60,38 @@ public class BaseCodeArea extends CodeArea {
     protected static final String STRING_PATTERN = "\"([^\"\\\\]|\\\\.)*\"";
     protected static final String COMMENT_PATTERN = "//[^\n]*" + "|" + "/\\*(.|\\R)*?\\*/";
 
+    /**
+     * The list of available classes.
+     */
+    @NotNull
+    protected final String[][] availableClasses;
+
     public BaseCodeArea() {
+        this.availableClasses = createAvailableClasses();
         richChanges().filter(ch -> !ch.getInserted().equals(ch.getRemoved()))
                 .subscribe(change -> setStyleSpans(0, calculateStyleSpans(getText())));
     }
 
+    /**
+     * Create a list of available classes.
+     *
+     * @return the list of available classes.
+     */
+    @FXThread
+    protected @NotNull String[][] createAvailableClasses() {
+        return AVAILABLE_CLASSES;
+    }
+
+    /**
+     * Get the list of available classes.
+     *
+     * @return the list of available classes.
+     */
+    @FXThread
+    protected @NotNull String[][] getAvailableClasses() {
+        return AVAILABLE_CLASSES;
+    }
+
     /**
      * Calculate highlighting for the code.
      *
@@ -92,7 +112,7 @@ public BaseCodeArea() {
 
             String styleClass = null;
 
-            for (final String[] availableClass : AVAILABLE_CLASSES) {
+            for (final String[] availableClass : getAvailableClasses()) {
 
                 try {
                     styleClass = matcher.group(availableClass[0]) != null ? availableClass[1] : null;

src/main/java/com/ss/editor/ui/control/code/GLSLCodeArea.java

@@ -4,7 +4,6 @@
 import com.ss.editor.util.GLSLType;
 import org.fxmisc.richtext.model.StyleSpans;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -66,7 +65,7 @@ public GLSLCodeArea() {
      * @return available fields.
      */
     @FXThread
-    private @Nullable List<String> getFields() {
+    private @NotNull List<String> getFields() {
         return fields;
     }
 
@@ -82,7 +81,7 @@ public GLSLCodeArea() {
                 "|(?<" + CLASS_VALUE_TYPE + ">" + VALUE_TYPE_PATTERN + ")";
 
         final List<String> fields = getFields();
-        if (fields != null && !fields.isEmpty()) {
+        if (!fields.isEmpty()) {
             result += "|(?<" + CLASS_VALUE_VALUE + ">" + "\\b(" + String.join("|", fields) + ")\\b";
         }