prettier 2.0.0 → 3.1.0

metadata

@@ -1,15 +1,99 @@
 --- !ruby/object:Gem::Specification
 name: prettier
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 3.1.0
 platform: ruby
 authors:
 - Kevin Newton
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-10-28 00:00:00.000000000 Z
-dependencies: []
+date: 2022-05-12 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: syntax_tree
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.3.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.3.1
+- !ruby/object:Gem::Dependency
+  name: syntax_tree-haml
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.1.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.1.0
+- !ruby/object:Gem::Dependency
+  name: syntax_tree-rbs
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.2.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.2.0
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description:
 email:
 executables:
@@ -22,80 +106,11 @@ files:
 - CONTRIBUTING.md
 - LICENSE
 - README.md
-- bin/console
-- dist/haml/embed.js
-- dist/haml/parser.js
-- dist/haml/parser.rb
-- dist/haml/printer.js
-- dist/parser/getInfo.js
-- dist/parser/netcat.js
-- dist/parser/parseSync.js
-- dist/parser/server.rb
-- dist/plugin.js
-- dist/prettier.js
-- dist/rbs/parser.js
-- dist/rbs/parser.rb
-- dist/rbs/printer.js
-- dist/ruby/embed.js
-- dist/ruby/nodes.js
-- dist/ruby/nodes/alias.js
-- dist/ruby/nodes/aref.js
-- dist/ruby/nodes/args.js
-- dist/ruby/nodes/arrays.js
-- dist/ruby/nodes/assign.js
-- dist/ruby/nodes/blocks.js
-- dist/ruby/nodes/calls.js
-- dist/ruby/nodes/case.js
-- dist/ruby/nodes/class.js
-- dist/ruby/nodes/commands.js
-- dist/ruby/nodes/conditionals.js
-- dist/ruby/nodes/constants.js
-- dist/ruby/nodes/flow.js
-- dist/ruby/nodes/hashes.js
-- dist/ruby/nodes/heredocs.js
-- dist/ruby/nodes/hooks.js
-- dist/ruby/nodes/ints.js
-- dist/ruby/nodes/lambdas.js
-- dist/ruby/nodes/loops.js
-- dist/ruby/nodes/massign.js
-- dist/ruby/nodes/methods.js
-- dist/ruby/nodes/operators.js
-- dist/ruby/nodes/params.js
-- dist/ruby/nodes/patterns.js
-- dist/ruby/nodes/regexp.js
-- dist/ruby/nodes/rescue.js
-- dist/ruby/nodes/return.js
-- dist/ruby/nodes/statements.js
-- dist/ruby/nodes/strings.js
-- dist/ruby/nodes/super.js
-- dist/ruby/nodes/undef.js
-- dist/ruby/parser.js
-- dist/ruby/parser.rb
-- dist/ruby/printer.js
-- dist/ruby/toProc.js
-- dist/types.js
-- dist/types/haml.js
-- dist/types/plugin.js
-- dist/types/rbs.js
-- dist/types/ruby.js
-- dist/types/utils.js
-- dist/utils.js
-- dist/utils/containsAssignment.js
-- dist/utils/getTrailingComma.js
-- dist/utils/hasAncestor.js
-- dist/utils/inlineEnsureParens.js
-- dist/utils/isEmptyBodyStmt.js
-- dist/utils/isEmptyStmts.js
-- dist/utils/literal.js
-- dist/utils/literallineWithoutBreakParent.js
-- dist/utils/makeCall.js
-- dist/utils/noIndent.js
-- dist/utils/printEmptyCollection.js
-- dist/utils/skipAssignIndent.js
 - exe/rbprettier
 - lib/prettier.rb
 - lib/prettier/rake/task.rb
 - node_modules/prettier/bin-prettier.js
+- node_modules/prettier/cli.js
 - node_modules/prettier/doc.js
 - node_modules/prettier/index.js
 - node_modules/prettier/package.json
@@ -114,6 +129,11 @@ files:
 - node_modules/prettier/third-party.js
 - package.json
 - rubocop.yml
+- src/getInfo.js
+- src/netcat.js
+- src/parseSync.js
+- src/plugin.js
+- src/server.rb
 homepage: https://github.com/prettier/plugin-ruby#readme
 licenses:
 - MIT
@@ -126,14 +146,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.7.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.3
+rubygems_version: 3.4.0.dev
 signing_key:
 specification_version: 4
 summary: prettier plugin for the Ruby programming language

data/bin/console

@@ -1,7 +0,0 @@
-#!/usr/bin/env ruby
-
-require 'bundler/setup'
-require 'prettier'
-
-require 'irb'
-IRB.start(__FILE__)

data/dist/haml/embed.js

@@ -1,53 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const prettier_1 = __importDefault(require("../prettier"));
-const { hardline, indent, literalline, markAsRoot, mapDoc, stripTrailingHardline } = prettier_1.default;
-// This function is in here because it handles embedded parser values. I don't
-// have a test that exercises it because I'm not sure for which parser it is
-// necessary, but since it's in prettier core I'm keeping it here.
-/* istanbul ignore next */
-function replaceNewlines(doc) {
-    return mapDoc(doc, (currentDoc) => typeof currentDoc === "string" && currentDoc.includes("\n")
-        ? currentDoc.split(/(\n)/g).map((v, i) => (i % 2 === 0 ? v : literalline))
-        : currentDoc);
-}
-const embed = (path, _print, textToDoc, opts) => {
-    const node = path.getValue();
-    // We're only going to embed other languages on filter nodes.
-    if (node.type !== "filter") {
-        return null;
-    }
-    let parser = node.value.name;
-    // We don't want to deal with some weird recursive parser situation, so we
-    // need to explicitly call out the HAML parser here and just return null.
-    if (parser === "haml") {
-        return null;
-    }
-    // In HAML the name of the JS filter is :javascript, whereas in prettier the
-    // name of the JS parser is babel. Here we explicitly handle that conversion.
-    if (parser === "javascript") {
-        parser = "babel";
-    }
-    // If there aren't any plugins that look like the name of the filter, then we
-    // will just exit early.
-    if (!opts.plugins.some((plugin) => typeof plugin !== "string" &&
-        plugin.parsers &&
-        Object.prototype.hasOwnProperty.call(plugin.parsers, parser))) {
-        return null;
-    }
-    // If there is a plugin that has a parser that matches the name of this
-    // filter, then we're going to assume that's correct for embedding and go
-    // ahead and switch to that parser.
-    return markAsRoot([
-        ":",
-        node.value.name,
-        indent([
-            hardline,
-            replaceNewlines(stripTrailingHardline(textToDoc(node.value.text, { parser })))
-        ])
-    ]);
-};
-exports.default = embed;

data/dist/haml/parser.js

@@ -1,31 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const parseSync_1 = __importDefault(require("../parser/parseSync"));
-const parser = {
-    // This function is responsible for taking an input string of text and
-    // returning to prettier a JavaScript object that is the equivalent AST that
-    // represents the code stored in that string. We accomplish this by spawning a
-    // new process and reading JSON off STDOUT.
-    parse(text) {
-        return (0, parseSync_1.default)("haml", text);
-    },
-    astFormat: "haml",
-    // This function handles checking whether or not the source string has the
-    // pragma for prettier. This is an optional workflow for incremental adoption.
-    hasPragma(text) {
-        return /^\s*-#\s*@(prettier|format)/.test(text);
-    },
-    // These functions are just placeholders until we can actually perform this
-    // properly. The functions are necessary otherwise the format with cursor
-    // functions break.
-    locStart() {
-        return 0;
-    },
-    locEnd() {
-        return 0;
-    }
-};
-exports.default = parser;

data/dist/haml/parser.rb

@@ -1,143 +0,0 @@
-# frozen_string_literal: true
-
-require 'ripper'
-
-begin
-  require 'haml'
-rescue LoadError
-  # If we can't load the haml gem, then we're going to provide a shim parser
-  # that will warn and bail out.
-  class Prettier::HAMLParser
-    def self.parse(text)
-      warn(
-        'The `haml` gem could not be loaded. Please ensure you have it ' \
-          'installed and that it is available in the gem path.'
-      )
-
-      false
-    end
-  end
-
-  return
-end
-
-class Haml::Parser::ParseNode
-  class DeepAttributeParser
-    def parse(string)
-      Haml::AttributeParser.available? ? parse_value(string) : string
-    end
-
-    private
-
-    def literal(string, level)
-      level == 0 ? string : "&#{string}"
-    end
-
-    def parse_value(string, level = 0)
-      response = Ripper.sexp(string)
-      return literal(string, level) unless response
-
-      case response[1][0][0]
-      when :hash
-        hash = Haml::AttributeParser.parse(string)
-
-        if hash
-          # Explicitly not using Enumerable#to_h here to support Ruby 2.5
-          hash.each_with_object({}) do |(key, value), response|
-            response[key] = parse_value(value, level + 1)
-          end
-        else
-          literal(string, level)
-        end
-      when :string_literal
-        string[1...-1]
-      else
-        literal(string, level)
-      end
-    end
-  end
-
-  ESCAPE = /Haml::Helpers.html_escape\(\((.+)\)\)/.freeze
-
-  # If a node comes in as the plain type but starts with one of the special
-  # characters that haml parses, then we need to escape it with a \ when
-  # printing. So here we make a regexp pattern to check if the node needs to be
-  # escaped.
-  special_chars =
-    Haml::Parser::SPECIAL_CHARACTERS.map { |char| Regexp.escape(char) }
-
-  SPECIAL_START = /\A(?:#{special_chars.join('|')})/
-
-  def as_json
-    case type
-    when :comment, :doctype, :silent_script
-      to_h.tap do |json|
-        json.delete(:parent)
-        json[:children] = children.map(&:as_json)
-      end
-    when :filter, :haml_comment
-      to_h.tap { |json| json.delete(:parent) }
-    when :plain
-      to_h.tap do |json|
-        json.delete(:parent)
-        json[:children] = children.map(&:as_json)
-
-        text = json[:value][:text]
-        json[:value][:text] = "\\#{text}" if text.match?(SPECIAL_START)
-      end
-    when :root
-      to_h.tap do |json|
-        json[:children] = children.map(&:as_json)
-
-        # We need this information in the printer to know how to lay out
-        # multi-line attributes.
-        json[:supports_multiline] =
-          Gem::Version.new(Haml::VERSION) >= Gem::Version.new('5.2')
-      end
-    when :script
-      to_h.tap do |json|
-        json.delete(:parent)
-        json[:children] = children.map(&:as_json)
-
-        if json[:value][:text].match?(ESCAPE)
-          json[:value][:text].gsub!(ESCAPE) { $1 }
-          json[:value].merge!(escape_html: 'escape_html', interpolate: true)
-        end
-      end
-    when :tag
-      to_h.tap do |json|
-        json.delete(:parent)
-
-        # For some reason this is actually using a symbol to represent a null
-        # object ref instead of nil itself, so just replacing it here for
-        # simplicity in the printer
-        json[:value][:object_ref] = nil if json[:value][:object_ref] == :nil
-
-        # Get a reference to the dynamic attributes hash
-        dynamic_attributes = value[:dynamic_attributes].to_h
-
-        # If we have any in the old style, then we're going to pass it through
-        # the deep attribute parser filter.
-        if dynamic_attributes[:old]
-          dynamic_attributes[:old] =
-            DeepAttributeParser.new.parse(dynamic_attributes[:old])
-        end
-
-        json.merge!(
-          children: children.map(&:as_json),
-          value: value.merge(dynamic_attributes: dynamic_attributes)
-        )
-      end
-    else
-      raise ArgumentError, "Unsupported type: #{type}"
-    end
-  end
-end
-
-module Prettier
-  class HAMLParser
-    def self.parse(source)
-      Haml::Parser.new({}).call(source).as_json
-    end
-  end
-end