Merge pull request #2118 from antoniusanggito/cwthedev-Iss2062_records

Add support for new record types (cont.)
beautifier · Nov 28, 2022 · 12bc378 · 12bc378
2 parents ca52d26 + 40020a4
commit 12bc378
Show file tree

Hide file tree

Showing 3 changed files with 75 additions and 0 deletions.
diff --git a/js/src/javascript/tokenizer.js b/js/src/javascript/tokenizer.js
@@ -167,6 +167,7 @@ Tokenizer.prototype._get_next_token = function(previous_token, open_token) { //
 
   token = token || this._read_non_javascript(c);
   token = token || this._read_string(c);
+  token = token || this._read_pair(c, this._input.peek(1)); // Issue #2062 hack for record type '#{'
   token = token || this._read_word(previous_token);
   token = token || this._read_singles(c);
   token = token || this._read_comment(c);
@@ -225,6 +226,19 @@ Tokenizer.prototype._read_singles = function(c) {
   return token;
 };
 
+Tokenizer.prototype._read_pair = function(c, d) {
+  var token = null;
+  if (c === '#' && d === '{') {
+    token = this._create_token(TOKEN.START_BLOCK, c + d);
+  }
+
+  if (token) {
+    this._input.next();
+    this._input.next();
+  }
+  return token;
+};
+
 Tokenizer.prototype._read_punctuation = function() {
   var resulting_string = this.__patterns.punct.read();
 

diff --git a/python/jsbeautifier/javascript/tokenizer.py b/python/jsbeautifier/javascript/tokenizer.py
@@ -220,6 +220,9 @@ def _get_next_token(self, previous_token, open_token):
 
         token = token or self._read_non_javascript(c)
         token = token or self._read_string(c)
+        token = token or self._read_pair(
+            c, self._input.peek(1)
+        )  # Issue #2062 hack for record type '#{'
         token = token or self._read_word(previous_token)
         token = token or self._read_singles(c)
         token = token or self._read_comment(c)
@@ -257,6 +260,18 @@ def _read_singles(self, c):
 
         return token
 
+    def _read_pair(self, c, d):
+        token = None
+
+        if c == "#" and d == "{":
+            token = self._create_token(TOKEN.START_BLOCK, c + d)
+
+        if token is not None:
+            self._input.next()
+            self._input.next()
+
+        return token
+
     def _read_word(self, previous_token):
         resulting_string = self._patterns.identifier.read()
 

diff --git a/test/data/javascript/tests.js b/test/data/javascript/tests.js
@@ -5377,6 +5377,52 @@ exports.test_data = {
           ]
         }
       ]
+    }, {
+      name: "Record data type",
+      description: "",
+      tests: [{
+          comment: 'regular record with primitive',
+          input: 'a = #{ b:"c", d:1, e:true };',
+          output: [
+            'a = #{',
+            '    b: "c",',
+            '    d: 1,',
+            '    e: true',
+            '};'
+          ]
+        },
+        {
+          comment: 'nested record',
+          input: 'a = #{b:#{ c:1,d:2,}, e:"f"};',
+          output: [
+            'a = #{',
+            '    b: #{',
+            '        c: 1,',
+            '        d: 2,',
+            '    },',
+            '    e: "f"',
+            '};'
+          ]
+        },
+        {
+          comment: '# not directly followed by { is not handled as record',
+          unchanged: [
+            'a = # {',
+            '    b: 1,',
+            '    d: true',
+            '};'
+          ]
+        },
+        {
+          comment: 'example of already valid and beautified record',
+          unchanged: [
+            'a = #{',
+            '    b: 1,',
+            '    d: true',
+            '};'
+          ]
+        }
+      ]
     }, {
       // =======================================================
       // New tests groups should be added above this line.