Merge pull request #58 from mtsmfm/use-released-rubocop

Use released rubocop

Author: mtsmfm

.rubocop.yml

@@ -1,5 +1,5 @@
 inherit_from:
-  - https://github.com/onk/onkcop/raw/v0.51.0.0/config/rubocop.yml
+  - https://github.com/onk/onkcop/raw/v0.52.0.0/config/rubocop.yml
 
 AllCops:
   TargetRubyVersion: 2.2
@@ -43,3 +43,6 @@ Metrics/ModuleLength:
 
 Metrics/LineLength:
   Max: 200
+  Exclude:
+    # To use power_assert, we must pub assertion in one line
+    - 'test/**/*'

Gemfile

@@ -3,5 +3,4 @@ source "https://rubygems.org"
 # Specify your gem's dependencies in language_server.gemspec
 gemspec
 
-# TODO: Use released gem after new release includes https://github.com/bbatsov/rubocop/pull/4987
-gem "rubocop", git: "https://github.com/bbatsov/rubocop", ref: "88d9e3b"
+gem "rubocop", "0.52"

lib/language_server/project/node.rb

@@ -5,7 +5,7 @@ class << self
         def attributes(*attrs)
           attr_accessor(*attrs)
           attribute_names.concat(attrs)
-          class_eval <<-RUBY, __FILE__, __LINE__
+          class_eval <<-RUBY, __FILE__, __LINE__ + 1
 def initialize(#{attribute_names.map { |n| "#{n}:" }.join(",")})
   #{attribute_names.map { |n|
       "@#{n} = #{n}"

test/language_server/linter/rubocop_test.rb

@@ -10,29 +10,23 @@ def test_fatal_error
       source = 'require "foo'
       actual = Rubocop.new(source, @config_path).call
       assert do
-        actual == [
-          Error.new(
-            line_num: 0,
-            message: "unterminated string meets end of file\n(Using Ruby 2.1 parser; configure using `TargetRubyVersion` parameter, under `AllCops`)",
-            type: "error",
-          ),
-        ]
+        actual.first == Error.new(line_num: 0, message: "Lint/Syntax: unterminated string meets end of file\n(Using Ruby 2.1 parser; configure using `TargetRubyVersion` parameter, under `AllCops`)", type: "error")
       end
     end
 
     def test_warning_error
       source = "a = 'a'"
       actual = Rubocop.new(source, @config_path).call
       assert do
-        actual.first == Error.new(line_num: 0, message: "Useless assignment to variable - `a`.", type: "warning")
+        actual.first == Error.new(line_num: 0, message: "Lint/UselessAssignment: Useless assignment to variable - `a`.", type: "warning")
       end
     end
 
     def test_convention_error
       source = 'require "foo"'
       actual = Rubocop.new(source, @config_path).call
       assert do
-        actual.first == Error.new(line_num: 0, message: "Prefer single-quoted strings when you don't need string interpolation or special symbols.", type: "warning")
+        actual.first == Error.new(line_num: 0, message: "Style/StringLiterals: Prefer single-quoted strings when you don't need string interpolation or special symbols.", type: "warning")
       end
     end
   end