jimeh-solargraph 0.40.4.0 → 0.40.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1bc09b67a21b704d406052aedcc27d6d345d555a96374b24005ad7e707fe2a82
-  data.tar.gz: 397a1cb3f450200026d4886c27ad40ac90c69d0dc81fa81a5d7f05a570667fe9
+  metadata.gz: ebdc45f294b8860094b90be97a988cf2ed4a43e767f3e4b50da7f60a1011cdc3
+  data.tar.gz: 976f697fbfe4e1082c56491382d8f170a14be328fd7cad6d0367f7db5122b282
 SHA512:
-  metadata.gz: 61b974b0bb067c6143b9d9b71228d6b7f95e3567cf75aaa9fbc7fade20a4a2b233713bf151029b7ddddb4a014875e1eb6b759f94c7aa12da8ca2c423dbaeaad0
-  data.tar.gz: 59b573435c26430c86794367a97dd3969828c0636f8aa832455990eae9023d36d4a4d22b0a3ef5efe0fdef571ca4060a032f9f4c313d8af58858aaec216a1fd3
+  metadata.gz: 4b3f4e6bdc7d3ef9600861b68831f04eff0de82a229233509cd944a3c508f3f4a40cf721e50a3e0db50c139725e8b463cc983bba3bc4558d747e7ae5a4a8f70b
+  data.tar.gz: fe947462017a54bb93a1a80f909635eec3d442a9b968828d8adfbec90986ad4b58c16bed952cc9bddc941eb5f66fb66acd17c8d92decd3abd6dba73d229e8211

data/lib/solargraph/diagnostics/rubocop.rb

@@ -57,7 +57,8 @@ module Solargraph
           range: offense_range(off).to_hash,
           # 1 = Error, 2 = Warning, 3 = Information, 4 = Hint
           severity: SEVERITIES[off['severity']],
-          source: off['cop_name'],
+          source: 'rubocop',
+          code: off['cop_name'],
           message: off['message'].gsub(/^#{off['cop_name']}\:/, '')
         }
       end

data/lib/solargraph/language_server/message/text_document/formatting.rb

@@ -11,8 +11,6 @@ module Solargraph
         class Formatting < Base
           include Solargraph::Diagnostics::RubocopHelpers
 
-          class BlankRubocopFormatter < ::RuboCop::Formatter::BaseFormatter; end
-
           def process
             file_uri = params['textDocument']['uri']
             config = config_for(file_uri)
@@ -21,11 +19,13 @@ module Solargraph
 
             options, paths = RuboCop::Options.new.parse(args)
             options[:stdin] = original
-            redirect_stdout do
+            corrections = redirect_stdout do
               RuboCop::Runner.new(options, RuboCop::ConfigStore.new).run(paths)
             end
             result = options[:stdin]
 
+            log_corrections(corrections)
+
             format original, result
           rescue RuboCop::ValidationError, RuboCop::ConfigNotFoundError => e
             set_error(Solargraph::LanguageServer::ErrorCodes::INTERNAL_ERROR, "[#{e.class}] #{e.message}")
@@ -33,6 +33,17 @@ module Solargraph
 
           private
 
+          def log_corrections(corrections)
+            corrections = corrections&.strip
+            return if corrections&.empty?
+
+            Solargraph.logger.info('Formatting result:')
+            corrections.each_line do |line|
+              next if line.strip.empty?
+              Solargraph.logger.info(line.strip)
+            end
+          end
+
           def config_for(file_uri)
             conf = host.formatter_config(file_uri)
             return {} unless conf.is_a?(Hash)
@@ -40,12 +51,11 @@ module Solargraph
             conf['rubocop'] || {}
           end
 
-          def cli_args file, config
+          def cli_args file_uri, config
+            file = UriHelpers.uri_to_file(file_uri)
             args = [
               config['cops'] == 'all' ? '--auto-correct-all' : '--auto-correct',
-              '--cache', 'false',
-              '--format', 'Solargraph::LanguageServer::Message::' \
-                          'TextDocument::Formatting::BlankRubocopFormatter',
+              '--cache', 'false', '--format', 'emacs'
             ]
 
             ['except', 'only'].each do |arg|

data/lib/solargraph/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Solargraph
-  VERSION = '0.40.4.0'
+  VERSION = '0.40.4.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jimeh-solargraph
 version: !ruby/object:Gem::Version
-  version: 0.40.4.0
+  version: 0.40.4.1
 platform: ruby
 authors:
 - Fred Snyder
@@ -557,7 +557,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: A Ruby language server