Merge pull request #9 from kris7t/cm6-sonar-fixes

Fix Sonar warnings introduced by CodeMirror 6 migration

3 files changed, 10 insertions, 15 deletions

diff --git a/language-ide/src/main/java/tools/refinery/language/ide/syntaxcoloring/ProblemSemanticHighlightingCalculator.java b/language-ide/src/main/java/tools/refinery/language/ide/syntaxcoloring/ProblemSemanticHighlightingCalculator.java
index d9abf12d..19eb1a03 100644
--- a/language-ide/src/main/java/tools/refinery/language/ide/syntaxcoloring/ProblemSemanticHighlightingCalculator.java
+++ b/language-ide/src/main/java/tools/refinery/language/ide/syntaxcoloring/ProblemSemanticHighlightingCalculator.java
@@ -96,20 +96,14 @@ public class ProblemSemanticHighlightingCalculator extends DefaultSemanticHighli
                         return new String[] { BUILTIN_CLASS };
                 }
                 ImmutableList.Builder<String> classesBuilder = ImmutableList.builder();
-                if (eObject instanceof ClassDeclaration classDeclaration) {
-                        if (classDeclaration.isAbstract()) {
-                                classesBuilder.add(ABSTRACT_CLASS);
-                        }
+                if (eObject instanceof ClassDeclaration classDeclaration && classDeclaration.isAbstract()) {
+                        classesBuilder.add(ABSTRACT_CLASS);
                 }
-                if (eObject instanceof ReferenceDeclaration referenceDeclaration) {
-                        if (referenceDeclaration.isContainment()) {
-                                classesBuilder.add(CONTAINMENT_CLASS);
-                        }
+                if (eObject instanceof ReferenceDeclaration referenceDeclaration && referenceDeclaration.isContainment()) {
+                        classesBuilder.add(CONTAINMENT_CLASS);
                 }
-                if (eObject instanceof PredicateDefinition predicateDefinition) {
-                        if (predicateDefinition.isError()) {
-                                classesBuilder.add(ERROR_CLASS);
-                        }
+                if (eObject instanceof PredicateDefinition predicateDefinition && predicateDefinition.isError()) {
+                        classesBuilder.add(ERROR_CLASS);
                 }
                 if (eObject instanceof Node node) {
                         if (reference == ProblemPackage.Literals.VARIABLE_OR_NODE_ARGUMENT__VARIABLE_OR_NODE) {
diff --git a/language-web/src/main/js/editor/EditorArea.tsx b/language-web/src/main/js/editor/EditorArea.tsx
index 678a632d..dba20f6e 100644
--- a/language-web/src/main/js/editor/EditorArea.tsx
+++ b/language-web/src/main/js/editor/EditorArea.tsx
@@ -95,8 +95,9 @@ export const EditorArea = observer(() => {
 
   useEffect(() => {
     if (editorParentRef.current === null) {
-      // Nothing to clean up.
-      return () => {};
+      return () => {
+        // Nothing to clean up.
+      };
     }
 
     const editorView = new EditorView({
diff --git a/language-web/src/main/js/language/indentation.ts b/language-web/src/main/js/language/indentation.ts
index 78f0a750..6d36ed3b 100644
--- a/language-web/src/main/js/language/indentation.ts
+++ b/language-web/src/main/js/language/indentation.ts
@@ -77,7 +77,7 @@ export function indentDeclaration(context: TreeIndentContext): number {
 
 export function indentPredicateOrRule(context: TreeIndentContext): number {
   const clauseIndent = indentDeclarationStrategy(context, 1);
-  if (/^\s+(;|\.)/.exec(context.textAfter) !== null) {
+  if (/^\s+[;.]/.exec(context.textAfter) !== null) {
     return clauseIndent - 2;
   }
   if (/^\s+(~>)/.exec(context.textAfter) !== null) {