Skip to content

Commit 4727183

Browse files
committed
$ bin/rubocop -a
1 parent 48e0910 commit 4727183

File tree

24 files changed

+279
-278
lines changed

24 files changed

+279
-278
lines changed

Gemfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
source 'https://rubygems.org'
1+
source "https://rubygems.org"
22

33
# Specify your gem's dependencies in language_server.gemspec
44
gemspec
55

66
# TODO: Use released gem after new release includes https://github.com/bbatsov/rubocop/pull/4987
7-
gem 'rubocop', git: 'https://github.com/bbatsov/rubocop'
7+
gem "rubocop", git: "https://github.com/bbatsov/rubocop"

Guardfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,5 @@ guard :minitest, all_after_pass: true do
55
watch(%r{^test/(.*)\/?test_(.*)\.rb$})
66
watch(%r{^test/(.*)\/?(.*)_test\.rb$})
77
watch(%r{^lib/(.*/)?([^/]+)\.rb$}) { |m| "test/#{m[1]}test_#{m[2]}.rb" }
8-
watch(%r{^test/test_helper\.rb$}) { 'test' }
8+
watch(%r{^test/test_helper\.rb$}) { "test" }
99
end

Rakefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ require "rake/testtask"
44
Rake::TestTask.new(:test) do |t|
55
t.libs << "test"
66
t.libs << "lib"
7-
t.test_files = FileList['test/**/*_test.rb']
7+
t.test_files = FileList["test/**/*_test.rb"]
88
end
99

1010
task :default => :test

benchmark/rubocop

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
#!/usr/bin/env ruby
22

3-
require 'bundler/setup'
4-
require 'benchmark/ips'
5-
require 'language_server'
3+
require "bundler/setup"
4+
require "benchmark/ips"
5+
require "language_server"
66

77
error_code = <<-EOS
88
require "foo
@@ -13,7 +13,7 @@ a = 1
1313
EOS
1414
valid_code = File.read(__FILE__)
1515

16-
require 'pry-byebug'
16+
require "pry-byebug"
1717

1818
LanguageServer::Linter::Rubocop.new(valid_code).call
1919
Benchmark.ips do |x|

benchmark/ruby_wc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
#!/usr/bin/env ruby
22

3-
require 'bundler/setup'
4-
require 'benchmark/ips'
5-
require 'language_server'
3+
require "bundler/setup"
4+
require "benchmark/ips"
5+
require "language_server"
66

77
error_code = <<-EOS
88
require "foo

language_server.gemspec

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
1-
# coding: utf-8
2-
lib = File.expand_path('../lib', __FILE__)
1+
2+
lib = File.expand_path("../lib", __FILE__)
33
$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
4-
require 'language_server/version'
4+
require "language_server/version"
55

66
Gem::Specification.new do |spec|
77
spec.name = "language_server"
88
spec.version = LanguageServer::VERSION
99
spec.authors = ["Fumiaki MATSUSHIMA"]
1010
spec.email = ["[email protected]"]
1111

12-
spec.summary = %q{A Ruby Language Server implementation}
13-
spec.description = %q{A Ruby Language Server implementation}
12+
spec.summary = "A Ruby Language Server implementation"
13+
spec.description = "A Ruby Language Server implementation"
1414
spec.homepage = "https://github.com/mtsmfm/language_server-ruby"
1515
spec.license = "MIT"
1616

@@ -19,24 +19,24 @@ Gem::Specification.new do |spec|
1919
f.match(%r{^(test|spec|features)/})
2020
end
2121
rescue
22-
Dir.glob("**/*").reject {|path| File.directory?(path) }
22+
Dir.glob("**/*").reject { |path| File.directory?(path) }
2323
end
2424
spec.bindir = "exe"
2525
spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
2626
spec.require_paths = ["lib"]
2727

28-
spec.add_dependency "rcodetools"
2928
spec.add_dependency "language_server-protocol", "0.4.0"
29+
spec.add_dependency "rcodetools"
3030

31+
spec.add_development_dependency "awesome_print"
32+
spec.add_development_dependency "benchmark-ips"
3133
spec.add_development_dependency "bundler", "~> 1.14"
32-
spec.add_development_dependency "rake", "~> 10.0"
33-
spec.add_development_dependency "minitest", "~> 5.0"
3434
spec.add_development_dependency "guard"
3535
spec.add_development_dependency "guard-minitest"
36+
spec.add_development_dependency "m"
37+
spec.add_development_dependency "minitest", "~> 5.0"
3638
spec.add_development_dependency "minitest-color"
37-
spec.add_development_dependency "pry-byebug"
3839
spec.add_development_dependency "minitest-power_assert"
39-
spec.add_development_dependency "m"
40-
spec.add_development_dependency "awesome_print"
41-
spec.add_development_dependency "benchmark-ips"
40+
spec.add_development_dependency "pry-byebug"
41+
spec.add_development_dependency "rake", "~> 10.0"
4242
end

lib/language_server.rb

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ def notify(method:, params: {})
3737

3838
method = request[:method].to_sym
3939

40-
_, subscriber = subscribers.find {|k, _|
40+
_, subscriber = subscribers.find { |k, _|
4141
k === method
4242
}
4343

@@ -46,7 +46,7 @@ def notify(method:, params: {})
4646
result = subscriber.call(
4747
{
4848
request: request, notifier: writer.method(:notify), variables: variables
49-
}.merge(variables).select {|k, _| keys.include?(k) }
49+
}.merge(variables).select { |k, _| keys.include?(k) },
5050
)
5151

5252
if request[:id]
@@ -74,14 +74,14 @@ def on(method, &callback)
7474
Protocol::Interface::InitializeResult.new(
7575
capabilities: Protocol::Interface::ServerCapabilities.new(
7676
text_document_sync: Protocol::Interface::TextDocumentSyncOptions.new(
77-
change: Protocol::Constant::TextDocumentSyncKind::FULL
77+
change: Protocol::Constant::TextDocumentSyncKind::FULL,
7878
),
7979
completion_provider: Protocol::Interface::CompletionOptions.new(
8080
resolve_provider: true,
81-
trigger_characters: %w(.)
81+
trigger_characters: %w[.],
8282
),
83-
definition_provider: true
84-
)
83+
definition_provider: true,
84+
),
8585
)
8686
end
8787

@@ -103,22 +103,22 @@ def on(method, &callback)
103103
range: Protocol::Interface::Range.new(
104104
start: Protocol::Interface::Position.new(
105105
line: error.line_num,
106-
character: 0
106+
character: 0,
107107
),
108108
end: Protocol::Interface::Position.new(
109109
line: error.line_num,
110-
character: 0
111-
)
112-
)
110+
character: 0,
111+
),
112+
),
113113
)
114114
end
115115

116116
notifier.call(
117117
method: :"textDocument/publishDiagnostics",
118118
params: Protocol::Interface::PublishDiagnosticsParams.new(
119119
uri: uri,
120-
diagnostics: diagnostics
121-
)
120+
diagnostics: diagnostics,
121+
),
122122
)
123123
end
124124

@@ -128,7 +128,7 @@ def on(method, &callback)
128128

129129
[
130130
CompletionProvider::AdHoc.new(uri: uri, line: line, character: character, project: project),
131-
CompletionProvider::Rcodetools.new(uri: uri, line: line, character: character, file_store: file_store)
131+
CompletionProvider::Rcodetools.new(uri: uri, line: line, character: character, file_store: file_store),
132132
].flat_map(&:call)
133133
end
134134

lib/language_server/completion_provider/ad_hoc.rb

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,35 +11,35 @@ def initialize(uri:, line:, character:, project:)
1111
end
1212

1313
def call
14-
(project.constants(uri: uri, line: line, character: character).map {|c|
14+
(project.constants(uri: uri, line: line, character: character).map { |c|
1515
Protocol::Interface::CompletionItem.new(
1616
label: c.name,
1717
detail: c.full_name,
1818
documentation: "#{c.remote_path}##{c.lineno}",
19-
kind: Protocol::Constant::CompletionItemKind::ENUM
19+
kind: Protocol::Constant::CompletionItemKind::ENUM,
2020
)
2121
} +
22-
project.classes(uri: uri, line: line, character: character).map {|c|
22+
project.classes(uri: uri, line: line, character: character).map { |c|
2323
Protocol::Interface::CompletionItem.new(
2424
label: c.name,
2525
detail: c.full_name,
2626
documentation: "#{c.remote_path}##{c.lineno}",
27-
kind: Protocol::Constant::CompletionItemKind::CLASS
27+
kind: Protocol::Constant::CompletionItemKind::CLASS,
2828
)
2929
} +
30-
project.modules(uri: uri, line: line, character: character).map {|m|
30+
project.modules(uri: uri, line: line, character: character).map { |m|
3131
Protocol::Interface::CompletionItem.new(
3232
label: m.name,
3333
detail: m.full_name,
3434
documentation: "#{m.remote_path}##{m.lineno}",
35-
kind: Protocol::Constant::CompletionItemKind::MODULE
35+
kind: Protocol::Constant::CompletionItemKind::MODULE,
3636
)
3737
}).uniq(&:label)
3838
end
3939

4040
private
4141

42-
attr_reader :uri, :line, :character, :project
42+
attr_reader :uri, :line, :character, :project
4343
end
4444
end
4545
end

lib/language_server/completion_provider/rcodetools.rb

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,16 +28,16 @@ def call
2828
Protocol::Interface::CompletionItem.new(
2929
label: method_name,
3030
detail: description,
31-
kind: Protocol::Constant::CompletionItemKind::METHOD
31+
kind: Protocol::Constant::CompletionItemKind::METHOD,
3232
)
3333
end
3434
end
3535

3636
private
3737

38-
def source
39-
@file_store.read_remote_uri(@uri)
40-
end
38+
def source
39+
@file_store.read_remote_uri(@uri)
40+
end
4141
end
4242
end
4343
end

lib/language_server/definition_provider/ad_hoc.rb

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,20 +15,20 @@ def call
1515
range: Protocol::Interface::Range.new(
1616
start: Protocol::Interface::Position.new(
1717
line: n.lines.begin,
18-
character: 0
18+
character: 0,
1919
),
2020
end: Protocol::Interface::Position.new(
2121
line: n.lines.end,
22-
character: 0
23-
)
24-
)
22+
character: 0,
23+
),
24+
),
2525
)
2626
end
2727
end
2828

2929
private
3030

31-
attr_reader :uri, :line, :character, :project
31+
attr_reader :uri, :line, :character, :project
3232
end
3333
end
3434
end

0 commit comments

Comments
 (0)