solargraph-rails 0.2.2.pre.2 → 0.2.2.pre.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7550cc551e9ee58ed7e88b5cac988326729410700f4833735c63e25423def03e
-  data.tar.gz: 50b16e19c7843b9e30956e68c14164763c130c1aceafb9c93fa25286c1f5d17c
+  metadata.gz: f2ceb38938b95c2d2772c9b863053613a30f91fb6bfdcf3a8373de01b8c95484
+  data.tar.gz: f385b1fd2a0839ba5f8fd9c5476b068c56ddcac510382cd453c3524ce6f50d82
 SHA512:
-  metadata.gz: 9d90365c3d92aa903a50d5210f09d5bab8f0326bb29b42216cc8def98df66e6dfc14e31e93c44ab025d58ca8c320425e0590f21b02c9f0c95a09c47098aeca44
-  data.tar.gz: 4e3ce253f78282b89c15eeb14b8ed2d7cd026bb12141fcefad04d5264321673b9a8b6af464913330f1f773ed11e96b91883bfef9a08df302290f8bc06fcb4dcc
+  metadata.gz: 11d1095b3e45568950dff2ed39272e282507f093e9021143b0108242b01d4ccd568ec3932f9fdb68f2b7aeea6c95f359fbdb464630238c01e7a92fbcf434fa1e
+  data.tar.gz: 420248dfa30f8da3e279a0e0f77fd48f6e1057ddaa5ab97aeaef96e76aa738cdb64ddb7ef3974594f4edf7cacce912820e0ec260286826808928527f73ab06be

data/Gemfile.lock

@@ -1,9 +1,9 @@
 PATH
   remote: .
   specs:
-    solargraph-rails (0.2.2.pre.2)
+    solargraph-rails (0.2.2.pre.3)
       activesupport (~> 6.1.3)
-      solargraph (~> 0.42.0)
+      solargraph (~> 0.42.1)
 
 GEM
   remote: https://rubygems.org/
@@ -15,7 +15,7 @@ GEM
       tzinfo (~> 2.0)
       zeitwerk (~> 2.3)
     ast (2.4.2)
-    backport (1.1.2)
+    backport (1.2.0)
     benchmark (0.1.1)
     bundler-audit (0.8.0)
       bundler (>= 1.2.0, < 3)
@@ -59,7 +59,7 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.10.0)
     rspec-support (3.10.0)
-    rubocop (1.16.1)
+    rubocop (1.17.0)
       parallel (~> 1.10)
       parser (>= 3.0.0.0)
       rainbow (>= 2.2.2, < 4.0)
@@ -71,8 +71,8 @@ GEM
     rubocop-ast (1.7.0)
       parser (>= 3.0.1.1)
     ruby-progressbar (1.11.0)
-    solargraph (0.42.1)
-      backport (~> 1.1)
+    solargraph (0.42.3)
+      backport (~> 1.2)
       benchmark
       bundler (>= 1.17.2)
       diff-lcs (~> 1.4)

data/lib/solargraph/rails/meta_source/association/belongs_to_matcher.rb

@@ -6,10 +6,18 @@ module MetaSource
       def match?(line)
         line =~ /belongs_to\s+:([a-z_]*)/
         @name = Regexp.last_match(1)
+
+        return unless @name
+
+        return @name unless line =~ /class_name:\s+["']([A-Za-z0-9]+)/
+
+        @type = Regexp.last_match(1)
+
+        @name
       end
 
       def type
-        name&.camelize
+        @type || name&.camelize
       end
     end
   end

data/lib/solargraph/rails/meta_source/association/has_and_belongs_to_many_matcher.rb

@@ -6,10 +6,18 @@ module MetaSource
       def match?(line)
         line =~ /has_and_belongs_to_many\s+:([a-z_]*)/
         @name = Regexp.last_match(1)
+
+        return unless @name
+
+        if line =~ /class_name:\s+["']([A-Za-z0-9]+)/
+          @type = Regexp.last_match(1)
+        end
+
+        @name
       end
 
       def type
-        "Array<#{name.singularize.camelize}>"
+        "ActiveRecord::Associations::CollectionProxy<#{@type || name.singularize.camelize}>"
       end
     end
   end

data/lib/solargraph/rails/meta_source/association/has_many_matcher.rb

@@ -6,10 +6,18 @@ module MetaSource
       def match?(line)
         line =~ /has_many\s+:([a-z_]*)/
         @name = Regexp.last_match(1)
+
+        return unless @name
+
+        if line =~ /class_name:\s+["']([A-Za-z0-9]+)/
+          @type = Regexp.last_match(1)
+        end
+
+        @name
       end
 
       def type
-        "Array<#{name.singularize.camelize}>"
+        "ActiveRecord::Associations::CollectionProxy<#{@type || name.singularize.camelize}>"
       end
     end
   end

data/lib/solargraph/rails/meta_source/association/has_one_matcher.rb

@@ -6,10 +6,18 @@ module MetaSource
       def match?(line)
         line =~ /has_one\s+:([a-z_]*)/
         @name = Regexp.last_match(1)
+
+        return unless @name
+
+        if line =~ /class_name:\s+["']([A-Za-z0-9]+)/
+          @type = Regexp.last_match(1)
+        end
+
+        @name
       end
 
       def type
-        name.camelize
+        @type || name.camelize
       end
     end
   end

data/lib/solargraph/rails/version.rb

@@ -1,5 +1,5 @@
 module Solargraph
   module Rails
-    VERSION = '0.2.2.pre.2'
+    VERSION = '0.2.2.pre.3'
   end
 end

data/solargraph-rails.gemspec

@@ -25,6 +25,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rake", "~> 12.3.3"
   spec.add_development_dependency "rspec", "~> 3.0"
 
-  spec.add_runtime_dependency "solargraph", "~> 0.42.0"
+  spec.add_runtime_dependency "solargraph", "~> 0.42.1"
   spec.add_runtime_dependency "activesupport", "~> 6.1.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solargraph-rails
 version: !ruby/object:Gem::Version
-  version: 0.2.2.pre.2
+  version: 0.2.2.pre.3
 platform: ruby
 authors:
 - Fritz Meissner
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-06-11 00:00:00.000000000 Z
+date: 2021-06-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.42.0
+        version: 0.42.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.42.0
+        version: 0.42.1
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement