ruby-lsp 0.3.4 → 0.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9a8db1decbd8a8d3a05226ececbd13ba54aa2a0b5e727fd9a752ccda5b52322d
-  data.tar.gz: 4f49ca2d80313dcd41e0410a1583ddc3f0c913305b4c3347611181a752561265
+  metadata.gz: 59e3f670a003f565c001d00333a727d8cf4080eb274d4ebdf248bc0ad76b9c16
+  data.tar.gz: 5010473614d96f47ba10a267844448d6b5985b469cdfec752489be268ba95510
 SHA512:
-  metadata.gz: 510bd7ef4da254c79da9af3437403ffe70a054718e9b0a33efc52b1bb49f93cf9c951729e6528ad4cbcf7d383fa7904835f8e0496482611c3891c3ed12ba784c
-  data.tar.gz: 2df5df95106e85a37c834c4ff77a5a19609e1946326ca86828292abb4440787b0eb8f38c9fd8f6f3cd2eb5460e8c27d0c41bb1c025d317f01502ab21afad4161
+  metadata.gz: '0853a29d497f7befc9bcbbd0387c3e456293728788b0067b91026f4c61c5013240284adc913471b5c015184b19752ecac5e958ab021f301e41c24ce55ed876e2'
+  data.tar.gz: c2ee016b997013590cad9c575b1461d50f833d3fc06a7b22aa953aa73d6163feb5d821fe443c4ba20b0ac25cf686f32ed26c34348016408f6118f45261cce8a9

data/VERSION

@@ -1 +1 @@
-0.3.4
+0.3.6

data/lib/ruby_lsp/document.rb

@@ -96,8 +96,9 @@ module RubyLsp
       end
 
       @tree = SyntaxTree.parse(@parsable_source)
-    rescue SyntaxTree::Parser::ParseError
-      # If we can't parse the source even after emptying the edits, then just fallback to the previous source
+    rescue StandardError
+      # Trying to maintain a parsable source when there are syntax errors is a best effort. If we fail to apply edits or
+      # parse, just ignore it
     end
 
     sig { params(source: String, range: RangeShape, text: String).void }

data/lib/ruby_lsp/requests/document_highlight.rb

@@ -27,11 +27,14 @@ module RubyLsp
 
       sig { params(document: Document, position: Document::PositionShape).void }
       def initialize(document, position)
+        super(document)
+
         @highlights = T.let([], T::Array[LanguageServer::Protocol::Interface::DocumentHighlight])
         position = Document::Scanner.new(document.source).find_position(position)
-        @target = T.let(find(T.must(document.tree), position), T.nilable(Support::HighlightTarget))
 
-        super(document)
+        return unless document.parsed?
+
+        @target = T.let(find(T.must(document.tree), position), T.nilable(Support::HighlightTarget))
       end
 
       sig { override.returns(T.all(T::Array[LanguageServer::Protocol::Interface::DocumentHighlight], Object)) }

data/lib/ruby_lsp/requests/document_link.rb

@@ -31,7 +31,7 @@ module RubyLsp
       class << self
         extend T::Sig
 
-        sig { returns(T::Hash[String, T::Array[String]]) }
+        sig { returns(T::Hash[String, T::Hash[String, T::Hash[String, String]]]) }
         def gem_paths
           @gem_paths ||= T.let(begin
             lookup = {}
@@ -61,7 +61,7 @@ module RubyLsp
             end
 
             lookup
-          end, T.nilable(T::Hash[String, T::Array[String]]))
+          end, T.nilable(T::Hash[String, T::Hash[String, T::Hash[String, String]]]))
         end
       end
 
@@ -88,7 +88,7 @@ module RubyLsp
         return unless match
 
         uri = T.cast(URI(match[0]), URI::Source)
-        gem_version = resolve_version(uri)
+        gem_version = T.must(resolve_version(uri))
         file_path = self.class.gem_paths.dig(uri.gem_name, gem_version, uri.path)
         return if file_path.nil?
 

data/lib/ruby_lsp/requests/hover.rb

@@ -1,8 +1,6 @@
 # typed: strict
 # frozen_string_literal: true
 
-require "ruby_lsp/requests/support/rails_document_client"
-
 module RubyLsp
   module Requests
     # ![Hover demo](../../misc/rails_document_link_hover.gif)

data/lib/ruby_lsp/requests/semantic_highlighting.rb

@@ -20,6 +20,7 @@ module RubyLsp
     # ```
     class SemanticHighlighting < BaseRequest
       extend T::Sig
+      include SyntaxTree::WithEnvironment
 
       TOKEN_TYPES = T.let({
         namespace: 0,
@@ -172,37 +173,52 @@ module RubyLsp
       def visit_params(node)
         node.keywords.each do |keyword,|
           location = keyword.location
-          add_token(location_without_colon(location), :variable)
+          add_token(location_without_colon(location), :parameter)
         end
 
         node.requireds.each do |required|
-          add_token(required.location, :variable)
+          add_token(required.location, :parameter)
         end
 
         rest = node.keyword_rest
-        return if rest.nil? || rest.is_a?(SyntaxTree::ArgsForward)
+        if rest && !rest.is_a?(SyntaxTree::ArgsForward)
+          name = rest.name
+          add_token(name.location, :parameter) if name
+        end
+
+        super
+      end
+
+      sig { override.params(node: SyntaxTree::Field).void }
+      def visit_field(node)
+        add_token(node.name.location, :method)
 
-        name = rest.name
-        add_token(name.location, :variable) if name
+        super
       end
 
       sig { override.params(node: SyntaxTree::VarField).void }
       def visit_var_field(node)
-        case node.value
+        value = node.value
+
+        case value
         when SyntaxTree::Ident
-          add_token(node.value.location, :variable)
+          type = type_for_local(value)
+          add_token(value.location, type)
         else
-          visit(node.value)
+          visit(value)
         end
       end
 
       sig { override.params(node: SyntaxTree::VarRef).void }
       def visit_var_ref(node)
-        case node.value
+        value = node.value
+
+        case value
         when SyntaxTree::Ident
-          add_token(node.value.location, :variable)
+          type = type_for_local(value)
+          add_token(value.location, type)
         else
-          visit(node.value)
+          visit(value)
         end
       end
 
@@ -263,6 +279,17 @@ module RubyLsp
       def special_method?(method_name)
         SPECIAL_RUBY_METHODS.include?(method_name)
       end
+
+      sig { params(value: SyntaxTree::Ident).returns(Symbol) }
+      def type_for_local(value)
+        local = current_environment.find_local(value.value)
+
+        if local.nil? || local.type == :variable
+          :variable
+        else
+          :parameter
+        end
+      end
     end
   end
 end

data/lib/ruby_lsp/requests/support/rails_document_client.rb

@@ -28,7 +28,7 @@ module RubyLsp
             params(name: String).returns(T::Array[String])
           end
           def generate_rails_document_urls(name)
-            docs = T.must(search_index)[name]
+            docs = search_index&.fetch(name, nil)
 
             return [] unless docs
 

data/lib/ruby_lsp/requests.rb

@@ -39,6 +39,7 @@ module RubyLsp
       autoload :SemanticTokenEncoder, "ruby_lsp/requests/support/semantic_token_encoder"
       autoload :SyntaxErrorDiagnostic, "ruby_lsp/requests/support/syntax_error_diagnostic"
       autoload :HighlightTarget, "ruby_lsp/requests/support/highlight_target"
+      autoload :RailsDocumentClient, "ruby_lsp/requests/support/rails_document_client"
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby-lsp
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.3.6
 platform: ruby
 authors:
 - Shopify
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-10-13 00:00:00.000000000 Z
+date: 2022-11-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: language_server-protocol
@@ -44,14 +44,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.6.3
+        version: 4.0.2
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 5.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.6.3
+        version: 4.0.2
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 5.0.0
 description: An opinionated language server for Ruby
 email:
 - ruby@shopify.com