standard 1.33.0 → 1.40.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d2d9b2d176cfaf42632e3007ae0520736726fe7bf4d0b8cf2bbfcace98bffbc3
-  data.tar.gz: 4f200b152f0d8bee0cce4540d3b19b4270180598fe4f534563875736f2beff9d
+  metadata.gz: 11a5e687261fb830d043558db4065c4533725a5997b1b70b3ba2b7656410fc2b
+  data.tar.gz: 1a38f3258931be3002752d726bcae77caf6e6dedb92b7e758cf65052b6db0464
 SHA512:
-  metadata.gz: 93430778d9de63b32a445825e4d68ad9fe9f7d4afc86b090482d1459ecd3c4a440326688287c3148ddec14a17755b82b9dfd119476d09737e62e1e5e1791aa92
-  data.tar.gz: e0d6055c79a0e81d236183f30a50edf4b4136c37525d182747155da6a67c29444477583fd223f72a2c54aa26f5fe94cc1326d4b9f6899b510d5aa0a2564872b4
+  metadata.gz: 399225a5d25d05fbef38bc7008801a680c48fc89c139820010ddd0ceffdc39008a1ec405dfe0ad414a43032d1c2227a0fb487618ce0f67bffe28cffa3afe35f5
+  data.tar.gz: feedd6180c2d564c3e0126e7f6f83731f8b029421030b7263f810e531b26943d5deec44247a8a6b136d3881b38c853762838e79742899ce091b1bf787201d893

data/.github/workflows/test.yml

@@ -16,12 +16,16 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest]
-        ruby-version: [2.7, '3.0', 3.1, 3.2, 3.3]
+        ruby-version:
+          - '3.0'
+          - '3.1'
+          - '3.2'
+          - '3.3'
 
     runs-on: ${{ matrix.os }}
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Set up Ruby ${{ matrix.ruby-version }}
         uses: ruby/setup-ruby@v1
         with:

data/.github/workflows/update.yml

@@ -14,7 +14,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Set up Ruby
         uses: ruby/setup-ruby@v1
         with:
@@ -45,7 +45,7 @@ jobs:
         id: date
         run: echo "::set-output name=date::$(date +'%Y-%m-%d')"
       - name: Create Pull Request
-        uses: peter-evans/create-pull-request@v3
+        uses: peter-evans/create-pull-request@v6
         with:
           reviewers: camilopayan
           commit-message: '[ ${{ steps.date.outputs.date }} ] - Update dependencies'

data/.standard.yml

@@ -1,4 +1,4 @@
-ruby_version: 2.6
+ruby_version: 3.0
 ignore:
   - tmp/**/*
   - test/fixture/**/*

data/CHANGELOG.md

@@ -1,5 +1,56 @@
 # Changelog
 
+## Unreleased
+
+## 1.40.0
+
+* Updates rubocop to [1.65.1](https://github.com/rubocop/rubocop/releases/tag/v1.65.1)
+
+## 1.39.2
+
+* Ensure a URI scheme on file paths from the built-in LSP [#642](https://github.com/standardrb/standard/pull/642).
+
+## 1.39.1
+
+* Fix LSP when `format` is set [#638](https://github.com/standardrb/standard/issues/638)
+* Fix LSP when todo is present (I think) [vscode-standard-ruby#26](https://github.com/standardrb/vscode-standard-ruby/issues/26)
+
+## 1.39.0
+
+* Add support for LSP Code Actions / Quick Fix under Ruby LSP [#636](https://github.com/standardrb/standard/pull/636)
+
+## 1.38.0
+
+* Update minimum Ruby version to 3.0
+* @koic backported a line column bug in our LSP
+  [#635](https://github.com/standardrb/standard/pull/635)
+* Implement a basic [Ruby LSP
+add-on](https://github.com/Shopify/ruby-lsp/blob/main/ADDONS.md), which means
+users would no longer need to install [our custom VS Code
+extension](https://marketplace.visualstudio.com/items?itemName=testdouble.vscode-standard-ruby)
+[#630](https://github.com/standardrb/standard/pull/630)
+
+## 1.37.0
+
+* Updates rubocop to [1.64.1](https://github.com/rubocop/rubocop/releases/tag/v1.64.1)
+
+## 1.36.0
+
+* Updates rubocop to [1.63.5](https://github.com/rubocop/rubocop/releases/tag/v1.63.5)
+* Updates standard-performance to [1.4.0](https://github.com/standardrb/standard-performance/releases/tag/v1.4.0)
+
+## 1.35.1
+
+* Corrects rubocop constraint to the patch version, not minor version.
+
+## 1.35.0
+
+* Updates rubocop to [1.62](https://github.com/rubocop/rubocop/releases/tag/v1.62.1)
+
+## 1.34.0
+
+* Updates rubocop to [1.60.2](https://github.com/rubocop/rubocop/releases/tag/v1.60.2)
+
 ## 1.33.0
 
 * Updates rubocop to [1.59.0](https://github.com/rubocop/rubocop/releases/tag/v1.59.0)
@@ -59,9 +110,9 @@ plugin that mirrors a rubocop extension
 ## 1.28.3
 
 * Older ruby support fixes from [@pboling](https://github.com/pboling):
-    - [#559](https://github.com/standardrb/standard/issues/559)
-    - [#561](https://github.com/standardrb/standard/issues/560)
-    - [#561](https://github.com/standardrb/standard/issues/561)
+  * [#559](https://github.com/standardrb/standard/issues/559)
+  * [#561](https://github.com/standardrb/standard/issues/560)
+  * [#561](https://github.com/standardrb/standard/issues/561)
 
 ## 1.28.2
 
@@ -546,7 +597,6 @@ mutations to RuboCop's default configuration)
   * [Performance/DeletePrefix](https://github.com/rubocop-hq/rubocop-performance/pull/105)
   * [Performance/DeleteSuffix](https://github.com/rubocop-hq/rubocop-performance/pull/105)
 
-
 ## 0.4.6
 
 * Disable `Naming/BinaryOperatorParameterName` because (when non-ascii method
@@ -578,7 +628,6 @@ mutations to RuboCop's default configuration)
     safe
   * Allow comments in empty `when` blocks
 
-
 ## 0.4.1
 
 * add given/given! as `{}` friendly blocks [#172](https://github.com/testdouble/standard/pull/172)

data/Gemfile

@@ -5,8 +5,9 @@ gemspec
 gem "bundler"
 gem "minitest", "~> 5.0"
 gem "rake", "~> 13.0"
-gem "gimme"
 gem "m"
+gem "mutex_m"
+gem "ruby-lsp"
 
 # You may want to run these off path locally:
 # gem "lint_roller", path: "../lint_roller"

data/Gemfile.lock

@@ -1,52 +1,61 @@
 PATH
   remote: .
   specs:
-    standard (1.33.0)
+    standard (1.40.0)
       language_server-protocol (~> 3.17.0.2)
       lint_roller (~> 1.0)
-      rubocop (~> 1.59.0)
+      rubocop (~> 1.65.0)
       standard-custom (~> 1.0.0)
-      standard-performance (~> 1.3)
+      standard-performance (~> 1.4)
 
 GEM
   remote: https://rubygems.org/
   specs:
     ast (2.4.2)
     docile (1.4.0)
-    gimme (0.5.0)
     json (2.6.3)
     language_server-protocol (3.17.0.3)
     lint_roller (1.1.0)
+    logger (1.6.0)
     m (1.6.2)
       method_source (>= 0.6.7)
       rake (>= 0.9.2.2)
     method_source (1.0.0)
     minitest (5.20.0)
+    mutex_m (0.2.0)
     parallel (1.23.0)
-    parser (3.2.2.4)
+    parser (3.3.0.5)
       ast (~> 2.4.1)
       racc
+    prism (0.30.0)
     racc (1.7.1)
     rainbow (3.1.1)
     rake (13.0.6)
+    rbs (3.5.2)
+      logger
     regexp_parser (2.8.2)
     rexml (3.2.6)
-    rubocop (1.59.0)
+    rubocop (1.65.1)
       json (~> 2.3)
       language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
-      parser (>= 3.2.2.4)
+      parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
-      regexp_parser (>= 1.8, < 3.0)
+      regexp_parser (>= 2.4, < 3.0)
       rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.30.0, < 2.0)
+      rubocop-ast (>= 1.31.1, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 3.0)
-    rubocop-ast (1.30.0)
-      parser (>= 3.2.1.0)
-    rubocop-performance (1.20.1)
+    rubocop-ast (1.31.2)
+      parser (>= 3.3.0.4)
+    rubocop-performance (1.21.0)
       rubocop (>= 1.48.1, < 2.0)
-      rubocop-ast (>= 1.30.0, < 2.0)
+      rubocop-ast (>= 1.31.1, < 2.0)
+    ruby-lsp (0.17.7)
+      language_server-protocol (~> 3.17.0)
+      prism (>= 0.29.0, < 0.31)
+      rbs (>= 3, < 4)
+      sorbet-runtime (>= 0.5.10782)
     ruby-progressbar (1.13.0)
     simplecov (0.22.0)
       docile (~> 1.1)
@@ -54,12 +63,13 @@ GEM
       simplecov_json_formatter (~> 0.1)
     simplecov-html (0.12.3)
     simplecov_json_formatter (0.1.4)
+    sorbet-runtime (0.5.11481)
     standard-custom (1.0.2)
       lint_roller (~> 1.0)
       rubocop (~> 1.50)
-    standard-performance (1.3.0)
+    standard-performance (1.4.0)
       lint_roller (~> 1.1)
-      rubocop-performance (~> 1.20.1)
+      rubocop-performance (~> 1.21.0)
     unicode-display_width (2.5.0)
 
 PLATFORMS
@@ -68,10 +78,11 @@ PLATFORMS
 
 DEPENDENCIES
   bundler
-  gimme
   m
   minitest (~> 5.0)
+  mutex_m
   rake (~> 13.0)
+  ruby-lsp
   simplecov
   standard!
 

data/README.md

@@ -11,7 +11,8 @@ configuration** to all of RuboCop's built-in rules as well as those included in
 [rubocop-performance](https://github.com/rubocop/rubocop-performance). It also
 supports plugins built with
 [lint_roller](https://github.com/standardrb/lint_roller), like
-[standard-rails](https://github.com/standardrb/standard-rails).
+[standard-rails](https://github.com/standardrb/standard-rails) and
+[standard-sorbet](https://github.com/standardrb/standard-sorbet).
 
 Standard Ruby was created and is maintained by the team at [Test
 Double](https://testdouble.com), because we appreciate the importance of
@@ -35,7 +36,7 @@ good idea. People also agree it's easier to work in codebases that exhibit a
 consistent style and format. So, what's the problem? **No two developers will
 ever agree on what all the rules and format should be.**
 
-This has resulted in innumerable teams arguing how to configure their linters
+This has resulted in innumerable teams arguing about how to configure their linters
 and formatters over literal decades. Some teams routinely divert time and energy
 from whatever they're building to reach consensus on where commas should go.
 Other teams have an overzealous tech lead who sets up everything _his favorite
@@ -76,17 +77,18 @@ is in using one at all and not in the particulars of how it's configured.
 ### Install
 
 Getting started is as easy as `gem install standard` or throwing it in your
-project's Gemfile:
+project's Gemfile and running `bundle install`:
 
 ```ruby
-gem "standard", group: [:development, :test]
+gem "standard"
 ```
 
-### Running Standard
+### Running Standard Ruby
 
-Once installed, you can either run it as a CLI or as a Rake task.
+Once installed, you can run Standard from the command line via its built-in
+executable or as a Rake task.
 
-The CLI is called `standardrb` to distinguish it from
+Standard Ruby's binary is named `standardrb` to distinguish it from
 [StandardJS](https://github.com/standard/standard):
 
 ```
@@ -137,8 +139,8 @@ $ rake standard:fix_unsafely
 
 So long as your code is checked into source control, there's no mortal harm in
 running with unsafe fixes enabled. If the changes look good to you and your
-tests pass, then it's probably less error prone than manually editing everything
-by hand.
+tests pass, then it's probably no more error prone than manually editing
+every change by hand.
 
 ## Integrating Standard into your workflow
 
@@ -151,11 +153,12 @@ continuous integration systems.
 
 We've added a number of editing guides for getting started:
 
-- [VS Code](https://github.com/standardrb/vscode-standard-ruby)
+- [VS Code](https://github.com/standardrb/standard/wiki/IDE:-vscode)
 - [vim](https://github.com/standardrb/standard/wiki/IDE:-vim)
 - [neovim](https://github.com/standardrb/standard/wiki/IDE:-neovim)
 - [RubyMine](https://www.jetbrains.com/help/ruby/rubocop.html#disable_rubocop)
 - [emacs](https://www.flycheck.org/en/latest/languages.html#syntax-checker-ruby-standard)
+- [Helix](https://github.com/helix-editor/helix/wiki/External-formatter-configuration#standardrb)
 - [Atom](https://github.com/standardrb/standard/wiki/IDE:-Atom)
 
 If you'd like to help by creating a guide, please draft one [in an
@@ -164,26 +167,39 @@ added!
 
 #### Language Server Protocol support
 
-If you don't see your preferred editor above, Standard Ruby also ships with a
-built-in [language
-server](https://microsoft.github.io/language-server-protocol/) that many modern
-editors can support natively, even without a Standard-specific plugin.
-
-You can run the server by supplying the `--lsp` flag:
-
-```
-standard --lsp
-```
-
-If your editor offers LSP support, it probably has a place to configure the
-above command and will subsequently manage the server process for you.
+If you don't see your preferred editor above, Standard Ruby also offers robust
+[language server](https://microsoft.github.io/language-server-protocol/) support,
+in two ways, both included with the `standard` gem:
+
+1. A [Ruby LSP](https://github.com/Shopify/ruby-lsp) add-on, which (if
+the `standard` gem is in your `Gemfile`) will be loaded automatically
+2. A language server executable, which can be run from the command line
+   with `standardrb --lsp`
+
+| Capability  | Ruby LSP Add-on | Internal Server |
+| ------------- | ------------- | ------------- |
+| Diagnostics (Linting) | ✅ ([Pull](https://microsoft.github.io/language-server-protocol/specifications/lsp/3.17/specification/#textDocument_pullDiagnostics)) | ✅ ([Push](https://microsoft.github.io/language-server-protocol/specifications/lsp/3.17/specification/#textDocument_publishDiagnostics)) |
+| [Formatting](https://microsoft.github.io/language-server-protocol/specifications/lsp/3.17/specification/#textDocument_formatting)  | ✅ | ✅ |
+| [Code Actions](https://microsoft.github.io/language-server-protocol/specifications/lsp/3.17/specification/#textDocument_codeAction) | ✅ | ❌ |
+| Everything else  | ❌  | ❌ |
+
+Due to the advantages of Pull diagnostics and its inclusion of Code Actions
+("Quick Fixes" in VS Code parlance), we recommend using Standard's [Ruby LSP
+add-on](https://github.com/standardrb/standard/wiki/IDE:-vscode#using-ruby-lsp)
+where possible.
+
+Regardless of which language server you use, many editors have added LSP
+support, with each bringing their own approach to configuration. Many LSP
+features should "just work", but when in doubt, please consult our [editor
+guides above](#editor-support) as well as your editor's own documentation on how
+to configure LSP formatters and linters.
 
 ### CI support
 
 Various continuous integration and quality-checking tools have been made to
 support Standard Ruby, as well.
 
-* [Github Actions](https://github.com/andrewmcodes/standardrb-action)
+* [GitHub Actions](https://github.com/standardrb/standard-ruby-action)
 * [Code Climate](https://github.com/standardrb/standard/wiki/CI:-Code-Climate)
 * [Pronto](https://github.com/julianrubisch/pronto-standardrb)
 * [Danger](https://github.com/ashfurrow/danger-rubocop/)
@@ -465,6 +481,7 @@ inherit_gem:
 Here are a few examples of Ruby Standard-compliant teams & projects:
 
 * [Test Double](https://testdouble.com/agency)
+* [AdBarker](https://adbarker.com)
 * [AlchemyCMS](https://alchemy-cms.com)
 * [Amazon Web Services](https://aws.amazon.com/)
 * [Arrows](https://arrows.to/)
@@ -475,6 +492,7 @@ Here are a few examples of Ruby Standard-compliant teams & projects:
 * [Brave Software](https://github.com/brave-intl/publishers)
 * [Collective Idea](https://collectiveidea.com/)
 * [Culture Foundry](https://www.culturefoundry.com/)
+* [Datadog](https://www.datadoghq.com/)
 * [Donut](https://www.donut.com/)
 * [Elevate Labs](https://elevatelabs.com)
 * [Envoy](https://www.envoy.com)
@@ -498,7 +516,9 @@ Here are a few examples of Ruby Standard-compliant teams & projects:
 * [Spinal](https://spinalcms.com/)
 * [Teamtailor](https://www.teamtailor.com/)
 * [thoughtbot](https://thoughtbot.com/)
+* [Topkey](https://topkey.io)
 * [University of Wisconsin-Eau Claire](https://www.uwec.edu/)
+* [Cartwheel](https://www.cartwheel.org)
 
 Does your team use Standard? [Add your name to the list](https://github.com/standardrb/standard/edit/main/README.md)!
 

data/config/base.yml

@@ -27,6 +27,9 @@ Bundler/InsecureProtocolSource:
 Bundler/OrderedGems:
   Enabled: false
 
+Gemspec/AddRuntimeDependency:
+  Enabled: false
+
 Gemspec/DependencyVersion:
   Enabled: false
 
@@ -1303,6 +1306,9 @@ Style/MagicCommentFormat:
 Style/MapCompactWithConditionalBlock:
   Enabled: true
 
+Style/MapIntoArray:
+  Enabled: false
+
 Style/MapToHash:
   Enabled: false
 
@@ -1566,7 +1572,7 @@ Style/RedundantHeredocDelimiterQuotes:
   Enabled: true
 
 Style/RedundantInitialize:
-  Enabled: true
+  Enabled: false
 
 Style/RedundantInterpolation:
   Enabled: true
@@ -1659,6 +1665,9 @@ Style/Semicolon:
 Style/Send:
   Enabled: false
 
+Style/SendWithLiteralMethodName:
+  Enabled: false
+
 Style/SignalException:
   Enabled: false
 
@@ -1721,6 +1730,9 @@ Style/Strip:
 Style/StructInheritance:
   Enabled: false
 
+Style/SuperArguments:
+  Enabled: true
+
 Style/SuperWithArgsParentheses:
   Enabled: true
 

data/config/default.yml

@@ -1,6 +1,5 @@
 AllCops:
-  # Prevent RuboCop from exploding when it finds an older-than-2.6 .ruby-version
-  TargetRubyVersion: 2.6
+  TargetRubyVersion: 3.0
   Exclude: []
   DisabledByDefault: true
   StyleGuideBaseURL: https://github.com/standardrb/standard

data/config/ruby-3.2.yml

@@ -1,4 +1,4 @@
-inherit_from: ./base.yml
+inherit_from: ./ruby-3.3.yml
 
 AllCops:
   TargetRubyVersion: 3.2

data/config/ruby-3.3.yml

@@ -0,0 +1,4 @@
+inherit_from: ./base.yml
+
+AllCops:
+  TargetRubyVersion: 3.3

data/lib/ruby_lsp/standard/addon.rb

@@ -0,0 +1,58 @@
+require "standard"
+require_relative "wraps_built_in_lsp_standardizer"
+
+module RubyLsp
+  module Standard
+    class Addon < ::RubyLsp::Addon
+      def name
+        "Standard Ruby"
+      end
+
+      def activate(global_state, message_queue)
+        @logger = ::Standard::Lsp::Logger.new(prefix: "[Standard Ruby]")
+        @logger.puts "Activating Standard Ruby LSP addon v#{::Standard::VERSION}"
+        RuboCop::LSP.enable
+        @wraps_built_in_lsp_standardizer = WrapsBuiltinLspStandardizer.new
+        global_state.register_formatter("standard", @wraps_built_in_lsp_standardizer)
+        register_additional_file_watchers(global_state, message_queue)
+        @logger.puts "Initialized Standard Ruby LSP addon #{::Standard::VERSION}"
+      end
+
+      def deactivate
+        @wraps_built_in_lsp_standardizer = nil
+      end
+
+      def register_additional_file_watchers(global_state, message_queue)
+        return unless global_state.supports_watching_files
+
+        message_queue << Request.new(
+          id: "standard-file-watcher",
+          method: "client/registerCapability",
+          params: Interface::RegistrationParams.new(
+            registrations: [
+              Interface::Registration.new(
+                id: "workspace/didChangeWatchedFilesStandard",
+                method: "workspace/didChangeWatchedFiles",
+                register_options: Interface::DidChangeWatchedFilesRegistrationOptions.new(
+                  watchers: [
+                    Interface::FileSystemWatcher.new(
+                      glob_pattern: "**/.standard{,_todo}.yml",
+                      kind: Constant::WatchKind::CREATE | Constant::WatchKind::CHANGE | Constant::WatchKind::DELETE
+                    )
+                  ]
+                )
+              )
+            ]
+          )
+        )
+      end
+
+      def workspace_did_change_watched_files(changes)
+        if changes.any? { |change| change[:uri].end_with?(".standard.yml") }
+          @wraps_built_in_lsp_standardizer.init!
+          @logger.puts "Re-initialized Standard Ruby LSP addon #{::Standard::VERSION} due to .standard.yml file change"
+        end
+      end
+    end
+  end
+end

data/lib/ruby_lsp/standard/wraps_built_in_lsp_standardizer.rb

@@ -0,0 +1,36 @@
+module RubyLsp
+  module Standard
+    class WrapsBuiltinLspStandardizer
+      include RubyLsp::Requests::Support::Formatter
+      def initialize
+        init!
+      end
+
+      def init!
+        @standardizer = ::Standard::Lsp::Standardizer.new(
+          ::Standard::BuildsConfig.new.call([])
+        )
+      end
+
+      def run_formatting(uri, document)
+        @standardizer.format(uri_to_path(uri), document.source)
+      end
+
+      def run_diagnostic(uri, document)
+        @standardizer.offenses(uri_to_path(uri), document.source, document.encoding)
+      end
+
+      private
+
+      # duplicated from: lib/standard/lsp/routes.rb
+      # modified to incorporate Ruby LSP's to_standardized_path method
+      def uri_to_path(uri)
+        if uri.respond_to?(:to_standardized_path) && !(standardized_path = uri.to_standardized_path).nil?
+          standardized_path
+        else
+          uri.to_s.sub(%r{^file://}, "")
+        end
+      end
+    end
+  end
+end

data/lib/standard/base/plugin.rb

@@ -57,6 +57,8 @@ module Standard::Base
         "ruby-3.1.yml"
       elsif desired_version < Gem::Version.new("3.3")
         "ruby-3.2.yml"
+      elsif desired_version < Gem::Version.new("3.4")
+        "ruby-3.3.yml"
       else
         default
       end

data/lib/standard/lsp/diagnostic.rb

@@ -0,0 +1,174 @@
+module Standard
+  module Lsp
+    class Diagnostic
+      Constant = LanguageServer::Protocol::Constant
+      Interface = LanguageServer::Protocol::Interface
+
+      RUBOCOP_TO_LSP_SEVERITY = {
+        info: Constant::DiagnosticSeverity::HINT,
+        refactor: Constant::DiagnosticSeverity::INFORMATION,
+        convention: Constant::DiagnosticSeverity::INFORMATION,
+        warning: Constant::DiagnosticSeverity::WARNING,
+        error: Constant::DiagnosticSeverity::ERROR,
+        fatal: Constant::DiagnosticSeverity::ERROR
+      }.freeze
+
+      def initialize(document_encoding, offense, uri, cop_class)
+        @document_encoding = document_encoding
+        @offense = offense
+        @uri = uri
+        @cop_class = cop_class
+      end
+
+      def to_lsp_code_actions
+        code_actions = []
+
+        code_actions << autocorrect_action if correctable?
+        code_actions << disable_line_action
+
+        code_actions
+      end
+
+      def to_lsp_diagnostic(config)
+        highlighted = @offense.highlighted_area
+        Interface::Diagnostic.new(
+          message: message,
+          source: "Standard Ruby",
+          code: @offense.cop_name,
+          code_description: code_description(config),
+          severity: severity,
+          range: Interface::Range.new(
+            start: Interface::Position.new(
+              line: @offense.line - 1,
+              character: highlighted.begin_pos
+            ),
+            end: Interface::Position.new(
+              line: @offense.line - 1,
+              character: highlighted.end_pos
+            )
+          ),
+          data: {
+            correctable: correctable?,
+            code_actions: to_lsp_code_actions
+          }
+        )
+      end
+
+      private
+
+      def message
+        message = @offense.message
+        message += "\n\nThis offense is not auto-correctable.\n" unless correctable?
+        message
+      end
+
+      def severity
+        RUBOCOP_TO_LSP_SEVERITY[@offense.severity.name]
+      end
+
+      def code_description(config)
+        return unless @cop_class
+
+        if (doc_url = @cop_class.documentation_url(config))
+          Interface::CodeDescription.new(href: doc_url)
+        end
+      end
+
+      def autocorrect_action
+        Interface::CodeAction.new(
+          title: "Autocorrect #{@offense.cop_name}",
+          kind: Constant::CodeActionKind::QUICK_FIX,
+          edit: Interface::WorkspaceEdit.new(
+            document_changes: [
+              Interface::TextDocumentEdit.new(
+                text_document: Interface::OptionalVersionedTextDocumentIdentifier.new(
+                  uri: ensure_uri_scheme(@uri.to_s).to_s,
+                  version: nil
+                ),
+                edits: correctable? ? offense_replacements : []
+              )
+            ]
+          ),
+          is_preferred: true
+        )
+      end
+
+      def offense_replacements
+        @offense.corrector.as_replacements.map do |range, replacement|
+          Interface::TextEdit.new(
+            range: Interface::Range.new(
+              start: Interface::Position.new(line: range.line - 1, character: range.column),
+              end: Interface::Position.new(line: range.last_line - 1, character: range.last_column)
+            ),
+            new_text: replacement
+          )
+        end
+      end
+
+      def disable_line_action
+        Interface::CodeAction.new(
+          title: "Disable #{@offense.cop_name} for this line",
+          kind: Constant::CodeActionKind::QUICK_FIX,
+          edit: Interface::WorkspaceEdit.new(
+            document_changes: [
+              Interface::TextDocumentEdit.new(
+                text_document: Interface::OptionalVersionedTextDocumentIdentifier.new(
+                  uri: ensure_uri_scheme(@uri.to_s).to_s,
+                  version: nil
+                ),
+                edits: line_disable_comment
+              )
+            ]
+          )
+        )
+      end
+
+      def line_disable_comment
+        new_text = if @offense.source_line.include?(" # standard:disable ")
+          ",#{@offense.cop_name}"
+        else
+          " # standard:disable #{@offense.cop_name}"
+        end
+
+        eol = Interface::Position.new(
+          line: @offense.line - 1,
+          character: length_of_line(@offense.source_line)
+        )
+
+        # TODO: fails for multiline strings - may be preferable to use block
+        # comments to disable some offenses
+        inline_comment = Interface::TextEdit.new(
+          range: Interface::Range.new(start: eol, end: eol),
+          new_text: new_text
+        )
+
+        [inline_comment]
+      end
+
+      def length_of_line(line)
+        if @document_encoding == Encoding::UTF_16LE
+          line_length = 0
+          line.codepoints.each do |codepoint|
+            line_length += 1
+            if codepoint > RubyLsp::Document::Scanner::SURROGATE_PAIR_START
+              line_length += 1
+            end
+          end
+          line_length
+        else
+          line.length
+        end
+      end
+
+      def correctable?
+        !@offense.corrector.nil?
+      end
+
+      def ensure_uri_scheme(uri)
+        uri = URI.parse(uri)
+        uri.scheme = "file" if uri.scheme.nil?
+        uri
+      end
+    end
+  end
+end

data/lib/standard/lsp/logger.rb

@@ -1,12 +1,13 @@
 module Standard
   module Lsp
     class Logger
-      def initialize
+      def initialize(prefix: "[server]")
+        @prefix = prefix
         @puts_onces = []
       end
 
       def puts(message)
-        warn("[server] #{message}")
+        warn [@prefix, message].compact.join(" ")
       end
 
       def puts_once(message)

data/lib/standard/lsp/routes.rb

@@ -13,7 +13,7 @@ module Standard
       end
 
       def self.handle(name, &block)
-        define_method("handle_#{name}", &block)
+        define_method(:"handle_#{name}", &block)
       end
 
       def for(name)
@@ -27,10 +27,6 @@ module Standard
         @writer.write(id: request[:id], result: Proto::Interface::InitializeResult.new(
           capabilities: Proto::Interface::ServerCapabilities.new(
             document_formatting_provider: true,
-            diagnostic_provider: LanguageServer::Protocol::Interface::DiagnosticOptions.new(
-              inter_file_dependencies: false,
-              workspace_diagnostics: false
-            ),
             text_document_sync: Proto::Interface::TextDocumentSyncOptions.new(
               change: Proto::Constant::TextDocumentSyncKind::FULL,
               open_close: true
@@ -51,12 +47,6 @@ module Standard
         end
       end
 
-      handle "textDocument/diagnostic" do |request|
-        doc = request[:params][:textDocument]
-        result = diagnostic(doc[:uri], doc[:text])
-        @writer.write(result)
-      end
-
       handle "textDocument/didChange" do |request|
         params = request[:params]
         result = diagnostic(params[:textDocument][:uri], params[:contentChanges][0][:text])
@@ -82,8 +72,15 @@ module Standard
         @logger.puts "Ignoring workspace/didChangeConfiguration"
       end
 
+      CONFIGURATION_FILE_PATTERNS = [
+        ".standard.yml",
+        ".standard_todo.yml"
+      ].freeze
+
       handle "workspace/didChangeWatchedFiles" do |request|
-        if request[:params][:changes].any? { |change| change[:uri].end_with?(".standard.yml") }
+        if request[:params][:changes].any? { |change|
+          CONFIGURATION_FILE_PATTERNS.any? { |path| change[:uri].end_with?(path) }
+        }
           @logger.puts "Configuration file changed; restart required"
           @kills_server.call
         end
@@ -164,45 +161,12 @@ module Standard
 
       def diagnostic(file_uri, text)
         @text_cache[file_uri] = text
-        offenses = @standardizer.offenses(uri_to_path(file_uri), text)
-
-        lsp_diagnostics = offenses.map { |o|
-          code = o[:cop_name]
-
-          msg = o[:message].delete_prefix(code)
-          loc = o[:location]
-
-          severity = case o[:severity]
-          when "error", "fatal"
-            SEV::ERROR
-          when "warning"
-            SEV::WARNING
-          when "convention"
-            SEV::INFORMATION
-          when "refactor", "info"
-            SEV::HINT
-          else # the above cases fully cover what RuboCop sends at this time
-            logger.puts "Unknown severity: #{severity.inspect}"
-            SEV::HINT
-          end
-
-          {
-            code: code,
-            message: msg,
-            range: {
-              start: {character: loc[:start_column] - 1, line: loc[:start_line] - 1},
-              end: {character: loc[:last_column] - 1, line: loc[:last_line] - 1}
-            },
-            severity: severity,
-            source: "standard"
-          }
-        }
 
         {
           method: "textDocument/publishDiagnostics",
           params: {
             uri: file_uri,
-            diagnostics: lsp_diagnostics
+            diagnostics: @standardizer.offenses(uri_to_path(file_uri), text)
           }
         }
       end

data/lib/standard/lsp/server.rb

@@ -13,11 +13,12 @@ module Standard
         @writer = Proto::Transport::Io::Writer.new($stdout)
         @reader = Proto::Transport::Io::Reader.new($stdin)
         @logger = Logger.new
-        @standardizer = Standard::Lsp::Standardizer.new(config, @logger)
+        @standardizer = Standard::Lsp::Standardizer.new(config)
         @routes = Routes.new(@writer, @logger, @standardizer)
       end
 
       def start
+        RuboCop::LSP.enable
         @reader.read do |request|
           if !request.key?(:method)
             @routes.handle_method_missing(request)

data/lib/standard/lsp/standardizer.rb

@@ -1,68 +1,33 @@
-require_relative "../runners/rubocop"
+require_relative "stdin_rubocop_runner"
+require_relative "diagnostic"
 
 module Standard
   module Lsp
     class Standardizer
-      def initialize(config, logger)
-        @config = config
-        @logger = logger
-        @rubocop_runner = Standard::Runners::Rubocop.new
+      def initialize(config)
+        @diagnostic_runner = ::Standard::Lsp::StdinRubocopRunner.new(config)
+        @format_runner = ::Standard::Lsp::StdinRubocopRunner.new(config.dup.tap { |c|
+          c.rubocop_options[:autocorrect] = true
+        })
+        @cop_registry = RuboCop::Cop::Registry.global.to_h
       end
 
-      # This abuses the --stdin option of rubocop and reads the formatted text
-      # from the options[:stdin] that rubocop mutates. This depends on
-      # parallel: false as well as the fact that rubocop doesn't otherwise dup
-      # or reassign that options object. Risky business!
-      #
-      # Reassigning options[:stdin] is done here:
-      #   https://github.com/rubocop/rubocop/blob/master/lib/rubocop/cop/team.rb#L131
-      # Printing options[:stdin]
-      #   https://github.com/rubocop/rubocop/blob/master/lib/rubocop/cli/command/execute_runner.rb#L95
-      # Setting `parallel: true` would break this here:
-      #   https://github.com/rubocop/rubocop/blob/master/lib/rubocop/runner.rb#L72
       def format(path, text)
-        ad_hoc_config = fork_config(path, text, format: true)
-        capture_rubocop_stdout(ad_hoc_config)
-        ad_hoc_config.rubocop_options[:stdin]
+        @format_runner.run(path, text)
+        @format_runner.formatted_source
       end
 
-      def offenses(path, text)
-        results = JSON.parse(
-          capture_rubocop_stdout(fork_config(path, text, format: false)),
-          symbolize_names: true
-        )
-        if results[:files].empty?
-          @logger.puts_once "Ignoring file, per configuration: #{path}"
-          []
-        else
-          results.dig(:files, 0, :offenses)
-        end
-      end
-
-      private
+      def offenses(path, text, document_encoding = nil)
+        @diagnostic_runner.run(path, text)
 
-      BASE_OPTIONS = {
-        force_exclusion: true,
-        parallel: false,
-        todo_file: nil,
-        todo_ignore_files: []
-      }
-      def fork_config(path, text, format:)
-        options = if format
-          {stdin: text, autocorrect: true, safe_autocorrect: true, formatters: []}
-        else
-          {stdin: text, autocorrect: false, safe_autocorrect: false, formatters: [["json"]], format: "json"}
+        @diagnostic_runner.offenses.map do |offense|
+          Diagnostic.new(
+            document_encoding,
+            offense,
+            path,
+            @cop_registry[offense.cop_name]&.first
+          ).to_lsp_diagnostic(@diagnostic_runner.config_for_working_directory)
         end
-        Standard::Config.new(@config.runner, [path], BASE_OPTIONS.merge(options), @config.rubocop_config_store)
-      end
-
-      def capture_rubocop_stdout(config)
-        redir = StringIO.new
-        $stdout = redir
-        @rubocop_runner.call(config)
-        redir.string
-      ensure
-        $stdout = STDOUT
       end
     end
   end

data/lib/standard/lsp/stdin_rubocop_runner.rb

@@ -0,0 +1,63 @@
+module Standard
+  module Lsp
+    # Originally lifted from:
+    # https://github.com/Shopify/ruby-lsp/blob/8d4c17efce4e8ecc8e7c557ab2981db6b22c0b6d/lib/ruby_lsp/requests/support/rubocop_runner.rb#L20
+    class StdinRubocopRunner < ::RuboCop::Runner
+      class ConfigurationError < StandardError; end
+
+      attr_reader :offenses
+
+      attr_reader :config_for_working_directory
+
+      DEFAULT_RUBOCOP_OPTIONS = {
+        stderr: true,
+        force_exclusion: true,
+        formatters: ["RuboCop::Formatter::BaseFormatter"],
+        raise_cop_error: true,
+        todo_file: nil,
+        todo_ignore_files: []
+      }.freeze
+
+      def initialize(config)
+        @options = {}
+        @offenses = []
+        @errors = []
+        @warnings = []
+
+        @config_for_working_directory = config.rubocop_config_store.for_pwd
+
+        super(
+          config.rubocop_options.merge(DEFAULT_RUBOCOP_OPTIONS),
+          config.rubocop_config_store
+        )
+      end
+
+      def run(path, contents)
+        @errors = []
+        @warnings = []
+        @offenses = []
+        @options[:stdin] = contents
+
+        super([path])
+
+        raise Interrupt if aborting?
+      rescue ::RuboCop::Runner::InfiniteCorrectionLoop => error
+        raise RubyLsp::Requests::Formatting::Erro, error.message
+      rescue ::RuboCop::ValidationError => error
+        raise ConfigurationError, error.message
+      rescue => error
+        raise ::RubyLsp::Requests::Support::InternalRuboCopError, error
+      end
+
+      def formatted_source
+        @options[:stdin]
+      end
+
+      private
+
+      def file_finished(_file, offenses)
+        @offenses = offenses
+      end
+    end
+  end
+end

data/lib/standard/plugin/merges_plugins_into_rubocop_config.rb

@@ -154,7 +154,7 @@ module Standard
       end
 
       def except(hash_or_config, keys)
-        hash_or_config.to_h.reject { |key, _| keys.include?(key) }.to_h
+        hash_or_config.to_h.except(*keys).to_h
       end
 
       # Always deletes nil entries, always overwrites arrays

data/lib/standard/version.rb

@@ -1,3 +1,3 @@
 module Standard
-  VERSION = Gem::Version.new("1.33.0")
+  VERSION = Gem::Version.new("1.40.0")
 end

data/standard.gemspec

@@ -7,7 +7,7 @@ Gem::Specification.new do |spec|
   spec.version = Standard::VERSION
   spec.authors = ["Justin Searls"]
   spec.email = ["searls@gmail.com"]
-  spec.required_ruby_version = ">= 2.6.0"
+  spec.required_ruby_version = ">= 3.0.0"
 
   spec.summary = "Ruby Style Guide, with linter & automatic code fixer"
   spec.homepage = "https://github.com/standardrb/standard"
@@ -23,11 +23,11 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
   spec.metadata["rubygems_mfa_required"] = "true"
 
-  spec.add_dependency "rubocop", "~> 1.59.0"
+  spec.add_dependency "rubocop", "~> 1.65.0"
 
   spec.add_dependency "lint_roller", "~> 1.0"
   spec.add_dependency "standard-custom", "~> 1.0.0"
-  spec.add_dependency "standard-performance", "~> 1.3"
+  spec.add_dependency "standard-performance", "~> 1.4"
 
   # not semver: first three are lsp protocol version, last is patch
   spec.add_dependency "language_server-protocol", "~> 3.17.0.2"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: standard
 version: !ruby/object:Gem::Version
-  version: 1.33.0
+  version: 1.40.0
 platform: ruby
 authors:
 - Justin Searls
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-12-26 00:00:00.000000000 Z
+date: 2024-08-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubocop
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.59.0
+        version: 1.65.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.59.0
+        version: 1.65.0
 - !ruby/object:Gem::Dependency
   name: lint_roller
   requirement: !ruby/object:Gem::Requirement
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.4'
 - !ruby/object:Gem::Dependency
   name: language_server-protocol
   requirement: !ruby/object:Gem::Requirement
@@ -117,11 +117,14 @@ files:
 - config/ruby-3.0.yml
 - config/ruby-3.1.yml
 - config/ruby-3.2.yml
+- config/ruby-3.3.yml
 - docs/ARCHITECTURE.md
 - docs/NEW_RUBIES.md
 - docs/RELEASE.md
 - docs/UPGRADING.md
 - exe/standardrb
+- lib/ruby_lsp/standard/addon.rb
+- lib/ruby_lsp/standard/wraps_built_in_lsp_standardizer.rb
 - lib/standard.rb
 - lib/standard/base.rb
 - lib/standard/base/plugin.rb
@@ -136,11 +139,13 @@ files:
 - lib/standard/formatter.rb
 - lib/standard/loads_runner.rb
 - lib/standard/loads_yaml_config.rb
+- lib/standard/lsp/diagnostic.rb
 - lib/standard/lsp/kills_server.rb
 - lib/standard/lsp/logger.rb
 - lib/standard/lsp/routes.rb
 - lib/standard/lsp/server.rb
 - lib/standard/lsp/standardizer.rb
+- lib/standard/lsp/stdin_rubocop_runner.rb
 - lib/standard/merges_settings.rb
 - lib/standard/plugin.rb
 - lib/standard/plugin/combines_plugin_configs.rb
@@ -176,14 +181,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.6.0
+      version: 3.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.4.10
 signing_key:
 specification_version: 4
 summary: Ruby Style Guide, with linter & automatic code fixer