prettier 0.17.0 → 0.18.0

data/src/parse.js

@@ -2,10 +2,14 @@ const { spawnSync } = require("child_process");
 const path = require("path");
 
 module.exports = (text, _parsers, _opts) => {
-  const child = spawnSync("ruby", [path.join(__dirname, "./ripper.rb")], {
-    input: text,
-    maxBuffer: 10 * 1024 * 1024 // 10MB
-  });
+  const child = spawnSync(
+    "ruby",
+    ["--disable-gems", path.join(__dirname, "./ripper.rb")],
+    {
+      input: text,
+      maxBuffer: 10 * 1024 * 1024 // 10MB
+    }
+  );
 
   const error = child.stderr.toString();
   if (error) {

data/src/ripper.rb

@@ -1,10 +1,12 @@
 #!/usr/bin/env ruby
 
-REQUIRED_VERSION = Gem::Version.new('2.5')
-if Gem::Version.new(RUBY_VERSION) < REQUIRED_VERSION
+# We implement our own version checking here instead of using Gem::Version so
+# that we can use the --disable-gems flag.
+major, minor, * = RUBY_VERSION.split('.').map(&:to_i)
+if (major < 2) || ((major == 2) && (minor < 5))
   warn(
-    "Ruby version #{RUBY_VERSION} not supported. " \
-      "Please upgrade to #{REQUIRED_VERSION} or above."
+    "Ruby version #{current_version} not supported. " \
+      "Please upgrade to #{required_version} or above."
   )
 
   exit 1
@@ -166,6 +168,7 @@ class RipperJS < Ripper
         assoc_splat: [:@op, '**'],
         arg_paren: :@lparen,
         args_add_star: [:@op, '*'],
+        args_forward: [:@op, '...'],
         begin: [:@kw, 'begin'],
         blockarg: [:@op, '&'],
         brace_block: :@lbrace,
@@ -290,7 +293,8 @@ class RipperJS < Ripper
           super(*body).merge!(
             start: node[:start],
             char_start: node[:char_start],
-            char_end: char_pos
+            char_end: char_pos,
+            quote: node[:body]
           )
         end
       end
@@ -319,14 +323,28 @@ class RipperJS < Ripper
       # child node.
       %i[dyna_symbol symbol_literal].each do |event|
         define_method(:"on_#{event}") do |*body|
-          char_start =
+          options =
             if scanner_events.any? { |sevent| sevent[:type] == :@symbeg }
-              find_scanner_event(:@symbeg)[:char_start]
+              symbeg = find_scanner_event(:@symbeg)
+
+              {
+                char_start: symbeg[:char_start],
+                char_end: char_pos,
+                quote: symbeg[:body][1]
+              }
+            elsif scanner_events.any? { |sevent| sevent[:type] == :@label_end }
+              label_end = find_scanner_event(:@label_end)
+
+              {
+                char_start: char_start_for(body),
+                char_end: char_pos,
+                quote: label_end[:body][0]
+              }
             else
-              char_start_for(body)
+              { char_start: char_start_for(body), char_end: char_pos }
             end
 
-          super(*body).merge!(char_start: char_start, char_end: char_pos)
+          super(*body).merge!(options)
         end
       end
 
@@ -630,6 +648,8 @@ class RipperJS < Ripper
     end
   )
 
+  # This module contains miscellaneous fixes required to get the right
+  # structure.
   prepend(
     Module.new do
       private
@@ -660,18 +680,6 @@ class RipperJS < Ripper
         super(*body).tap { |node| node[:body][0][:body] << __end__ if __end__ }
       end
 
-      # Adds the used quote type onto string nodes. This is necessary because
-      # we're going to have to stick to whatever quote the user chose if there
-      # are escape sequences within the string. For example, if you have '\n'
-      # we can't switch to double quotes without changing what it means.
-      def on_tstring_end(quote)
-        last_sexp.merge!(quote: quote)
-      end
-
-      def on_label_end(quote)
-        last_sexp.merge!(quote: quote[0]) # quote is ": or ':
-      end
-
       # Normally access controls are reported as vcall nodes. This creates a
       # new node type to explicitly track those nodes instead, so that the
       # printer can add new lines as necessary.

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: prettier
 version: !ruby/object:Gem::Version
-  version: 0.17.0
+  version: 0.18.0
 platform: ruby
 authors:
 - Kevin Deisz
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-12-12 00:00:00.000000000 Z
+date: 2020-03-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -72,7 +72,6 @@ files:
 - node_modules/prettier/index.js
 - node_modules/prettier/third-party.js
 - package.json
-- src/escapePattern.js
 - src/haml.js
 - src/haml/embed.js
 - src/haml/nodes/comment.js
@@ -139,7 +138,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: prettier plugin for the Ruby programming language

data/src/escapePattern.js

@@ -1,45 +0,0 @@
-/**
- * String literal syntax documentation from Ruby source (2.7.0-dev)
- *
- * Double-quote strings allow escaped characters such as <tt>\n</tt> for
- * newline, <tt>\t</tt> for tab, etc.  The full list of supported escape
- * sequences are as follows:
- *
- *   \a             bell, ASCII 07h (BEL)
- *   \b             backspace, ASCII 08h (BS)
- *   \t             horizontal tab, ASCII 09h (TAB)
- *   \n             newline (line feed), ASCII 0Ah (LF)
- *   \v             vertical tab, ASCII 0Bh (VT)
- *   \f             form feed, ASCII 0Ch (FF)
- *   \r             carriage return, ASCII 0Dh (CR)
- *   \e             escape, ASCII 1Bh (ESC)
- *   \s             space, ASCII 20h (SPC)
- *   \\             backslash, \
- *   \nnn           octal bit pattern, where nnn is 1-3 octal digits ([0-7])
- *   \xnn           hexadecimal bit pattern, where nn is 1-2 hexadecimal digits ([0-9a-fA-F])
- *   \unnnn         Unicode character, where nnnn is exactly 4 hexadecimal digits ([0-9a-fA-F])
- *   \u{nnnn ...}   Unicode character(s), where each nnnn is 1-6 hexadecimal digits ([0-9a-fA-F])
- *   \cx or \C-x    control character, where x is an ASCII printable character
- *   \M-x           meta character, where x is an ASCII printable character
- *   \M-\C-x        meta control character, where x is an ASCII printable character
- *   \M-\cx         same as above
- *   \c\M-x         same as above
- *   \c? or \C-?    delete, ASCII 7Fh (DEL)
- *
- * In addition to disabling interpolation, single-quoted strings also disable all
- * escape sequences except for the single-quote (<tt>\'</tt>) and backslash
- * (<tt>\\\\</tt>).
- */
-const patterns = [
-  "[abtnvfres\\\\]", // simple
-  "[0-7]{1,3}", // octal bits
-  "x[0-9a-fA-F]{1,2}", // hex bit
-  "u[0-9a-fA-F]{4}", // unicode char
-  "u\\{[0-9a-fA-F ]+\\}", // unicode chars
-  "c[ -~]|C\\-[ -~]", // control
-  "M\\-[ -~]", // meta
-  "M\\-\\\\C\\-[ -~]|M\\-\\\\c[ -~]|c\\\\M\\-[ -~]", // meta control
-  "c\\?|C\\-\\?" // delete
-];
-
-module.exports = new RegExp(`\\\\(${patterns.join("|")})`);