JS: reformatting fails for classes that contain a static initializer

webcommon/javascript2.editor/src/org/netbeans/modules/javascript2/editor/formatter/JsFormatVisitor.java

@@ -969,13 +969,15 @@ public boolean enterVarNode(VarNode varNode) {
 
     @Override
     public boolean enterClassElement(ClassElement propertyNode) {
-        FormatToken colon = tokenUtils.getNextToken(getFinish(propertyNode.getKey()),
-                JsTokenId.OPERATOR_COLON, getFinish(propertyNode));
-        if (colon != null) {
-            TokenUtils.appendToken(colon, FormatToken.forFormat(FormatToken.Kind.AFTER_PROPERTY_OPERATOR));
-            FormatToken before = colon.previous();
-            if (before != null) {
-                TokenUtils.appendTokenAfterLastVirtual(before, FormatToken.forFormat(FormatToken.Kind.BEFORE_PROPERTY_OPERATOR));
+        if (propertyNode.getKey() != null) {
+            FormatToken colon = tokenUtils.getNextToken(getFinish(propertyNode.getKey()),
+                    JsTokenId.OPERATOR_COLON, getFinish(propertyNode));
+            if (colon != null) {
+                TokenUtils.appendToken(colon, FormatToken.forFormat(FormatToken.Kind.AFTER_PROPERTY_OPERATOR));
+                FormatToken before = colon.previous();
+                if (before != null) {
+                    TokenUtils.appendTokenAfterLastVirtual(before, FormatToken.forFormat(FormatToken.Kind.BEFORE_PROPERTY_OPERATOR));
+                }
             }
         }
         return super.enterPropertyNode(propertyNode);

webcommon/javascript2.editor/test/unit/data/testfiles/formatter/staticClassInitializer1.js

@@ -0,0 +1,9 @@
+class Dummy {
+                                                       #privateField;
+                                                       constructor(v) {
+                                                         this.#privateField = v;
+                                                       }
+                                                       static {
+                                                         console.log("Dummy");
+                                                       }
+                                                     }

webcommon/javascript2.editor/test/unit/data/testfiles/formatter/staticClassInitializer1.js.formatted

@@ -0,0 +1,9 @@
+class Dummy {
+    #privateField;
+    constructor(v) {
+        this.#privateField = v;
+    }
+    static {
+        console.log("Dummy");
+    }
+}

webcommon/javascript2.editor/test/unit/src/org/netbeans/modules/javascript2/editor/formatter/JsFormatterTest.java

@@ -2543,4 +2543,8 @@ public void testCommentAtTheEdnOfLine() throws Exception {
                 "} //comment2\n" +
                 "p = stripName(p);", null);
     }
+
+    public void testFormatStaticClassInitializer() throws Exception {
+        reformatFileContents("testfiles/formatter/staticClassInitializer1.js",new IndentPrefs(4, 4));
+    }
 }