ruby_language_server 0.3.16 → 0.3.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bbab25376f7165888330fb96c5b0da91f6d0656ae6f7ceb36b1bfe7b4c036cf6
-  data.tar.gz: 036050f7c473fd078087e5944e87a567ea0f074a3a15e2cc793892e7815376ee
+  metadata.gz: 0b9331721f750df7c683c22e8afb8591e002cdc779ba2b99fd94566f7d34e11e
+  data.tar.gz: a9865c1ca41b3860d4651f477ea4f0595c917e5730a01b135c5aee75e8d62da6
 SHA512:
-  metadata.gz: 0be805b10e8c457ac22d2613cc2da3203953d99962e20c66883aa56cf711a868890c42833227bda771ddd81716ee36aa5b912c00808471d2e7290870ce5569ad
-  data.tar.gz: fca402851a24ac39f23a61fef71bf179d23807cb715a2615d27d44280490e85305e0001f84d2e6f4fee99d0f674efd0438c6ef348ccce96839a99ae2d3efd720
+  metadata.gz: 7c48ba51bcd0f863a4df9003d482c9e7e7891a5788bb247f30d0306fd5f5171d45bc93687c4d78f429ec49a78c2b769e3ec9a20c50b3c2ed39a0315314df4001
+  data.tar.gz: 6035b4ab5245d9f5abbc20a5c59595b22540fef7fd3747bda92aa52f84c53affec76cb9d8d595245846a3a9e1d1a6b8b1c19b1d36b35952ba37e9862fb496d4d

data/CHANGELOG.txt

@@ -1,5 +1,12 @@
 # Changelog
 
+#### 0.3.17 Mon Aug 19 21:47:30 PDT 2024
+
+* Update ruby to 3.3
+
+#### 0.3.16.1 Thu Feb 17 23:27:11 PST 2022
+
+* Update docker image to be cross-platform
 
 #### 0.3.16 Fri Jun 11 19:03:10 PDT 2021
 

data/Gemfile.lock

@@ -1,33 +1,33 @@
 PATH
   remote: .
   specs:
-    ruby_language_server (0.3.16)
-      activerecord (~> 6.1)
+    ruby_language_server (0.3.17)
+      activerecord (~> 7.0)
       amatch
       bundler
       etc
       fuzzy_match
       json
-      rubocop
+      rubocop (> 1.38.0)
+      rubocop-ast (> 1.32.0)
       rubocop-performance
       rubocop-rspec
-      sqlite3
+      sqlite3 (< 1.5.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (6.1.3.1)
-      activesupport (= 6.1.3.1)
-    activerecord (6.1.3.1)
-      activemodel (= 6.1.3.1)
-      activesupport (= 6.1.3.1)
-    activesupport (6.1.3.1)
+    activemodel (7.0.7.2)
+      activesupport (= 7.0.7.2)
+    activerecord (7.0.7.2)
+      activemodel (= 7.0.7.2)
+      activesupport (= 7.0.7.2)
+    activesupport (7.0.7.2)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
       tzinfo (~> 2.0)
-      zeitwerk (~> 2.3)
-    amatch (0.4.0)
+    amatch (0.4.1)
       mize
       tins (~> 1.0)
     ansi (1.5.0)
@@ -35,37 +35,37 @@ GEM
     builder (3.2.4)
     byebug (11.1.3)
     coderay (1.1.3)
-    concurrent-ruby (1.1.8)
-    etc (1.2.0)
-    ffi (1.15.0)
-    formatador (0.2.5)
+    concurrent-ruby (1.2.2)
+    etc (1.3.0)
+    ffi (1.15.5)
+    formatador (1.1.0)
     fuzzy_match (2.1.0)
-    guard (2.16.2)
+    guard (2.18.0)
       formatador (>= 0.2.4)
       listen (>= 2.7, < 4.0)
       lumberjack (>= 1.0.12, < 2.0)
       nenv (~> 0.1)
       notiffany (~> 0.0)
-      pry (>= 0.9.12)
+      pry (>= 0.13.0)
       shellany (~> 0.0)
       thor (>= 0.18.1)
     guard-compat (1.2.1)
     guard-minitest (2.4.6)
       guard-compat (~> 1.2)
       minitest (>= 3.0)
-    guard-rubocop (1.4.0)
+    guard-rubocop (1.5.0)
       guard (~> 2.0)
       rubocop (< 2.0)
-    i18n (1.8.10)
+    i18n (1.14.1)
       concurrent-ruby (~> 1.0)
-    json (2.5.1)
-    listen (3.5.1)
+    json (2.6.2)
+    listen (3.7.1)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
     lumberjack (1.2.8)
     method_source (1.0.0)
-    minitest (5.14.4)
-    minitest-reporters (1.4.3)
+    minitest (5.16.3)
+    minitest-reporters (1.5.0)
       ansi
       builder
       minitest (>= 5.0)
@@ -76,70 +76,74 @@ GEM
     notiffany (0.1.3)
       nenv (~> 0.1)
       shellany (~> 0.0)
-    parallel (1.20.1)
-    parser (3.0.1.0)
+    parallel (1.22.1)
+    parser (3.3.4.2)
       ast (~> 2.4.1)
+      racc
     protocol (2.0.0)
       ruby_parser (~> 3.0)
-    pry (0.13.1)
+    pry (0.14.1)
       coderay (~> 1.1)
       method_source (~> 1.0)
-    pry-byebug (3.9.0)
-      byebug (~> 11.0)
-      pry (~> 0.13.0)
-    rainbow (3.0.0)
-    rake (13.0.3)
-    rb-fsevent (0.10.4)
+    racc (1.8.1)
+    rainbow (3.1.1)
+    rake (13.0.6)
+    rb-fsevent (0.11.2)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
-    regexp_parser (2.1.1)
+    regexp_parser (2.6.0)
     rexml (3.2.5)
-    rubocop (1.13.0)
+    rubocop (1.42.0)
+      json (~> 2.3)
       parallel (~> 1.10)
-      parser (>= 3.0.0.0)
+      parser (>= 3.1.2.1)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
-      rexml
-      rubocop-ast (>= 1.2.0, < 2.0)
+      rexml (>= 3.2.5, < 4.0)
+      rubocop-ast (>= 1.24.1, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.4.1)
-      parser (>= 2.7.1.5)
-    rubocop-performance (1.11.0)
+    rubocop-ast (1.32.1)
+      parser (>= 3.3.1.0)
+    rubocop-minitest (0.34.5)
+      rubocop (>= 1.39, < 2.0)
+      rubocop-ast (>= 1.30.0, < 2.0)
+    rubocop-performance (1.19.1)
       rubocop (>= 1.7.0, < 2.0)
       rubocop-ast (>= 0.4.0)
-    rubocop-rspec (2.2.0)
+    rubocop-rake (0.6.0)
       rubocop (~> 1.0)
-      rubocop-ast (>= 1.1.0)
+    rubocop-rspec (3.0.0)
+      rubocop (~> 1.40)
     ruby-progressbar (1.11.0)
-    ruby_parser (3.15.1)
-      sexp_processor (~> 4.9)
-    sexp_processor (4.15.2)
+    ruby_parser (3.19.1)
+      sexp_processor (~> 4.16)
+    sexp_processor (4.16.1)
     shellany (0.0.1)
-    sqlite3 (1.4.2)
+    sqlite3 (1.4.4)
     sync (0.5.0)
-    thor (1.1.0)
-    tins (1.28.0)
+    thor (1.2.1)
+    tins (1.31.1)
       sync
-    tzinfo (2.0.4)
+    tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
-    unicode-display_width (2.0.0)
-    zeitwerk (2.4.2)
+    unicode-display_width (2.3.0)
 
 PLATFORMS
-  x86_64-linux-musl
+  aarch64-linux-musl
+  x86_64-linux
 
 DEPENDENCIES
+  byebug
   guard
   guard-minitest
   guard-rubocop
   minitest
   minitest-reporters
-  pry
-  pry-byebug
   rake
+  rubocop-minitest
+  rubocop-rake
   ruby_language_server!
-  sexp_processor
 
 BUNDLED WITH
-   2.2.16
+   2.3.25

data/Makefile

@@ -39,3 +39,8 @@ gem: image
 # Requires rubygems be installed on host
 gem_release: gem
 	docker run -it --rm $(LOCAL_LINK) $(PROJECT_NAME) gem push $(PROJECT_NAME)*.gem
+
+publish_cross_platform_image:
+	(docker buildx ls | grep mybuilder) || docker buildx create --name mybuilder
+	docker buildx use mybuilder
+	docker buildx build --push --platform linux/amd64,linux/arm64/v8 -t kwerle/$(PROJECT_NAME) .

data/README.md

@@ -31,17 +31,17 @@ You probably want to use one of the developed integrations:
 
 # Development
 
+Master branch is for releases.  Develop branch is for ongoing development.  Fork off develop;
+I'll merge to master for releases.
+
 Clone.  I love git [HubFlow](https://datasift.github.io/gitflow/).
 
 Check out the [Makefile](Makefile).  You are going to want to do
 `make guard` in one window and `make continuous_development` in another.
 
-* In Atom: install the ide-ruby.
-* Settings > Packages > ide-ruby > Image Name > local_ruby_language_server
-* CMD-ALT-CTRL-l (that's an L) will reload the window
-* CMD-ALT-i will show debugging info
-
-Write tests and guard will run them.  Make changes and reload the window.  Test them out.
+I use vscode with the "Ruby Language Server" extension install.  I edit the settings to use
+the docker image local_ruby_language_server.  Quitting and restarting vscode to load the next
+iteration.
 
 # Similar
 
@@ -50,12 +50,15 @@ Write tests and guard will run them.  Make changes and reload the window.  Test
 
 # Release instructions to self
 
-* For for release
+For gem release
 * bump version in [version.rb](lib/ruby_language_server/version.rb) file and [Gemfile.lock](Gemfile.lock)
 * [CHANGELOG.txt](CHANGELOG.txt)
 * merge to master, etc
 * `make gem_release`
 
+For docker release
+* `make publish_cross_platform_image`
+
 # Authors
 
 * [Kurt Werle](kurt@CircleW.org)

data/lib/config/initializers/active_record.rb

@@ -2,10 +2,9 @@
 
 ActiveRecord::Base.establish_connection(
   adapter: 'sqlite3',
-  database: 'file:memory?mode=memory&cache=shared',
-  # database: '/database',
-  pool: 5, # does not seem to help
-  checkout_timeout: 30.seconds # does not seem to help
+  database: '/database',
+  pool: 5,
+  timeout: 30.seconds # does not seem to help
 )
 
 database = ActiveRecord::Base.connection.instance_variable_get :@connection
@@ -21,7 +20,7 @@ database.enable_load_extension(0)
 if ENV['LOG_LEVEL'] == 'DEBUG'
   begin
     warn('Turning on active record logging to active_record.log')
-    ActiveRecord::Base.logger = Logger.new(File.open('active_record.log', 'w'))
+    ActiveRecord::Base.logger = Logger.new(File.open('/active_record.log', 'w'))
   rescue Exception => e
     ActiveRecord::Base.logger = Logger.new($stderr)
     ActiveRecord::Base.logger.error(e)

data/lib/db/schema.rb

@@ -1,44 +1,66 @@
 # frozen_string_literal: true
 
-ActiveRecord::Schema.define do
-  def write(*args)
-    RubyLanguageServer.logger.debug(args)
-  end
+module Schema
+  class << self
+    def load
+      ActiveRecord::Schema.define do
+        def write(*args)
+          RubyLanguageServer.logger.debug(args)
+        end
 
-  create_table :scopes, force: true do |t|
-    t.references :code_file
-    t.integer :parent_id
-    t.integer :top_line        # first line
-    t.integer :bottom_line     # last line
-    t.integer :column
-    t.string  :name, default: ''
-    t.string  :superclass_name
-    t.string  :path
-    t.string  :class_type, null: false
-  end
+        create_table :scopes, force: true do |t|
+          t.references :code_file
+          t.integer :parent_id
+          t.integer :top_line        # first line
+          t.integer :bottom_line     # last line
+          t.integer :column
+          t.string  :name, default: ''
+          t.string  :superclass_name
+          t.string  :path
+          t.string  :class_type, null: false
+        end
 
-  add_index :scopes, :name
-  add_index :scopes, :path
-  add_index :scopes, :code_file
-
-  create_table :variables, force: true do |t|
-    t.references :code_file
-    t.references :scope
-    t.integer :line
-    t.integer :column
-    t.string  :name
-    t.string  :path
-    t.string  :variable_type
-  end
+        add_index :scopes, :name
+        add_index :scopes, :path
+        add_index :scopes, :code_file
 
-  add_index :variables, :name
-  add_index :variables, :code_file
+        create_table :variables, force: true do |t|
+          t.references :code_file
+          t.references :scope
+          t.integer :line
+          t.integer :column
+          t.string  :name
+          t.string  :path
+          t.string  :variable_type
+        end
 
-  create_table :code_files, force: true do |t|
-    t.string  :uri
-    t.boolean :refresh_root_scope, default: true
-    t.text    :text
-  end
+        add_index :variables, :name
+        add_index :variables, :code_file
+
+        create_table :code_files, force: true do |t|
+          t.string  :uri
+          t.boolean :refresh_root_scope, default: true
+          t.text    :text
+        end
 
-  add_index :code_files, :uri
+        add_index :code_files, :uri
+      end
+    end
+
+    # If we dive in using a console attached to a running container we do NOT want to reset all the table data!
+    # Which it seems like sqlite is happy to do?
+    # So we utter some arcane sqlite code to find the existing tables if there are any.
+    def already_initialized
+      response = ActiveRecord::Base.connection_pool.with_connection { |con| con.exec_query "SELECT name  FROM sqlite_master WHERE type='table'" }
+      response.rows.flatten.member?('code_files')
+    rescue ExceptionName
+      false
+    end
+
+    def initialize_if_needed
+      load unless already_initialized
+    end
+  end
 end
+
+Schema.initialize_if_needed

data/lib/ruby_language_server/code_file.rb

@@ -20,7 +20,7 @@ module RubyLanguageServer
     def self.build(uri, text)
       RubyLanguageServer.logger.debug("CodeFile initialize #{uri}")
 
-      create!(uri: uri, text: text)
+      create!(uri:, text:)
     end
 
     SYMBOL_KIND = {
@@ -70,7 +70,7 @@ module RubyLanguageServer
         kind = 9 if scope.name == 'initialize' # Magical special case
         scope_hash = {
           name: scope.name,
-          kind: kind,
+          kind:,
           location: Location.hash(uri, scope.top_line)
         }
         container_name = ancestor_scope_name(scope)
@@ -80,7 +80,7 @@ module RubyLanguageServer
       tags += variables.constant_variables.reload.map do |variable|
         name = variable.name
         {
-          name: name,
+          name:,
           kind: SYMBOL_KIND[:constant],
           location: Location.hash(uri, variable.line - 1),
           containerName: variable.scope.name
@@ -108,7 +108,7 @@ module RubyLanguageServer
       update(text: new_text, refresh_root_scope: true)
     end
 
-    def refresh_scopes_if_needed
+    def refresh_scopes_if_needed(shallow: false)
       return unless refresh_root_scope
 
       RubyLanguageServer.logger.debug("Asking about root_scope for #{uri}")
@@ -117,7 +117,7 @@ module RubyLanguageServer
           self.class.transaction do
             scopes.clear
             variables.clear
-            new_root = ScopeParser.new(text).root_scope
+            new_root = ScopeParser.new(text, shallow).root_scope
             RubyLanguageServer.logger.debug("new_root.children #{new_root.children.as_json}") if new_root&.children
             raise ActiveRecord::Rollback if new_root.nil? || new_root.children.blank?
 
@@ -132,7 +132,7 @@ module RubyLanguageServer
     def context_at_location(position)
       lines = text.split("\n")
       line = lines[position.line]
-      return [] if line.nil? || line.strip.length.zero?
+      return [] if line.nil? || line.strip.empty?
 
       LineContext.for(line, position.character)
     end

data/lib/ruby_language_server/completion.rb

@@ -47,7 +47,7 @@ module RubyLanguageServer
       private
 
       def scopes_with_name(name, scopes)
-        return scopes.where(name: name) if scopes.respond_to?(:where)
+        return scopes.where(name:) if scopes.respond_to?(:where)
 
         scopes.select { |scope| scope.name == name }
       end
@@ -80,14 +80,6 @@ module RubyLanguageServer
       def scope_completions(word, scopes)
         return module_completions(word) if word.match?(/\A[A-Z][a-z]/)
 
-        # scope_ids = scopes.map(&:id)
-        # word_scopes = scopes.to_a + RubyLanguageServer::ScopeData::Scope.where(parent_id: scope_ids)
-        # scope_words = word_scopes.select(&:named_scope?).sort_by(&:depth).map { |scope| [scope.name, scope] }
-        # variable_words = RubyLanguageServer::ScopeData::Variable.where(scope_id: scope_ids).map { |variable| [variable.name, variable.scope] }
-        # words = (scope_words + variable_words).to_h
-        # good_words = FuzzyMatch.new(words.keys, threshold: 0.01).find_all(word).slice(0..10) || []
-        # words = good_words.each_with_object({}) { |w, hash| hash[w] = {depth: words[w].depth, type: words[w].class_type} }.to_h
-
         scope_ids = scopes.map(&:id)
         word_scopes = scopes.to_a + RubyLanguageServer::ScopeData::Scope.where(parent_id: scope_ids).closest_to(word).limit(5)
         scope_words = word_scopes.select(&:named_scope?).sort_by(&:depth).map { |scope| [scope.name, scope] }

data/lib/ruby_language_server/good_cop.rb

@@ -102,7 +102,7 @@ module RubyLanguageServer
       if excluded_file?(filename)
         []
       else
-        ruby_version = 2.7
+        ruby_version = 3.1
         processed_source = RuboCop::ProcessedSource.new(text, ruby_version, filename)
         offenses = inspect_file(processed_source)
         offenses.compact.flatten.reject(&:blank?) # reject blank because some are `false`
@@ -136,13 +136,15 @@ module RubyLanguageServer
 
     class << self
       def instance
+        return @instance if @instance
+
         @config_path ||= config_path
         config_path_timestamp = File.mtime(@config_path)
         if @cached_config_path_timestamp.nil? || @cached_config_path_timestamp < config_path_timestamp
           @cached_config_path_timestamp = config_path_timestamp
           @instance = new(@config_path)
         else
-          @instance
+          @instance = new
         end
       rescue StandardError => e
         @instance = new(@config_path, e.to_s)

data/lib/ruby_language_server/io.rb

@@ -24,7 +24,7 @@ module RubyLanguageServer
     def return_response(id, response, io = $stdout)
       full_response = {
         jsonrpc: '2.0',
-        id: id,
+        id:,
         result: response
       }
       response_body = JSON.unparse(full_response)
@@ -39,7 +39,7 @@ module RubyLanguageServer
       full_response = {
         jsonrpc: '2.0',
         method: message,
-        params: params
+        params:
       }
       body = JSON.unparse(full_response)
       RubyLanguageServer.logger.info "send_notification body: #{body}"
@@ -58,11 +58,17 @@ module RubyLanguageServer
       params = request_json['params']
       method_name = "on_#{method_name.gsub(/[^\w]/, '_')}"
       if @server.respond_to? method_name
-        RubyLanguageServer.logger.debug 'Locking io'
-        response = @mutex.synchronize do
-          @server.send(method_name, params)
+        response = ActiveRecord::Base.connection_pool.with_connection do
+          retries = 3
+          begin
+            @server.send(method_name, params)
+          rescue StandardError => e
+            RubyLanguageServer.logger.warn("Error updating: #{e}\n#{e.backtrace * "\n"}")
+            sleep 5
+            retries -= 1
+            retry unless retries <= 0
+          end
         end
-        RubyLanguageServer.logger.debug 'UNLocking io'
         exit(true) if response == 'EXIT'
         [id, response]
       else

data/lib/ruby_language_server/location.rb

@@ -26,6 +26,6 @@ module RubyLanguageServer
           }
         }
       end
-      end
+    end
   end
 end

data/lib/ruby_language_server/logger.rb

@@ -3,12 +3,11 @@
 require 'logger'
 
 module RubyLanguageServer
-  level_name = ENV.fetch('LOG_LEVEL', 'error').upcase
-  # level_name = 'DEBUG'
+  level_name = ENV.fetch('LOG_LEVEL', 'error').upcase || 'DEBUG'
   level = Logger::Severity.const_get(level_name)
   class << self
     attr_accessor :logger
   end
-  @logger = ::Logger.new($stderr, level: level)
+  @logger = ::Logger.new($stderr, level:)
   @logger.log(level, "Logger started at level #{level_name} -> #{level}")
 end

data/lib/ruby_language_server/project_manager.rb

@@ -22,7 +22,7 @@ module RubyLanguageServer
       def root_path
         # I'm torn about this.  Should this be set in the Server?  Or is this right.
         # Rather than worry too much, I'll just do this here and change it later if it feels wrong.
-        path = ENV['RUBY_LANGUAGE_SERVER_PROJECT_ROOT'] || @_root_path
+        path = ENV.fetch('RUBY_LANGUAGE_SERVER_PROJECT_ROOT') { @_root_path }
         return path if path.nil?
 
         path.end_with?(File::SEPARATOR) ? path : "#{path}#{File::SEPARATOR}"
@@ -179,28 +179,36 @@ module RubyLanguageServer
     #   data?: any
     # }
 
-    def scan_all_project_files(mutex)
+    def scan_all_project_files
       project_ruby_files = Dir.glob("#{self.class.root_path}**/*.rb")
-      Thread.new do
-        RubyLanguageServer.logger.debug('Threading up!')
-        root_uri = @root_uri
-        root_uri += '/' unless root_uri.end_with? '/'
+      RubyLanguageServer.logger.debug('Threading up!')
+      root_uri = @root_uri
+      root_uri += '/' unless root_uri.end_with? '/'
+      # Using fork because this is run in a docker container that has fork.
+      # If you want to run this on some platform without fork, fork the code and PR it :-)
+      fork_id = fork do
         project_ruby_files.each do |container_path|
-          # Let's not preload spec/test or vendor - yet..
-          next if container_path.match?(/^(.?spec|test|vendor)/)
+          # Let's not preload spec/test files or vendor - yet..
+          next if container_path.match?(/(spec\.rb|test\.rb|vendor)/)
 
           text = File.read(container_path)
           relative_path = container_path.delete_prefix(self.class.root_path)
           host_uri = root_uri + relative_path
-          RubyLanguageServer.logger.debug "Locking scan for #{container_path}"
-          mutex.synchronize do
-            RubyLanguageServer.logger.debug("Threading #{host_uri}")
-            update_document_content(host_uri, text)
-            code_file_for_uri(host_uri).refresh_scopes_if_needed
+          RubyLanguageServer.logger.debug("Threading #{host_uri}")
+          begin
+            ActiveRecord::Base.connection_pool.with_connection do |_connection|
+              update_document_content(host_uri, text)
+              code_file_for_uri(host_uri).refresh_scopes_if_needed(shallow: true)
+            end
+          rescue StandardError => e
+            RubyLanguageServer.logger.warn("Error updating: #{e}\n#{e.backtrace * "\n"}")
+            sleep 5
+            retry
           end
-          RubyLanguageServer.logger.debug "Unlocking scan for #{container_path}"
         end
       end
+      RubyLanguageServer.logger.debug("Forked process id to look at other files: #{fork_id}")
+      Process.detach(fork_id)
     end
 
     # returns diagnostic info (if possible)
@@ -218,7 +226,7 @@ module RubyLanguageServer
       # Maybe we should be sharing this GoodCop across instances
       RubyLanguageServer.logger.debug("updated_diagnostics_for_codefile: #{code_file.uri}")
       project_relative_filename = filename_relative_to_project(code_file.uri)
-      code_file.diagnostics = GoodCop.instance.diagnostics(code_file.text, project_relative_filename)
+      code_file.diagnostics = GoodCop.instance&.diagnostics(code_file.text, project_relative_filename)
       RubyLanguageServer.logger.debug("code_file.diagnostics: #{code_file.diagnostics}")
       code_file.diagnostics
     end
@@ -261,8 +269,8 @@ module RubyLanguageServer
     end
 
     def project_definitions_for(name)
-      scopes = RubyLanguageServer::ScopeData::Scope.where(name: name)
-      variables = RubyLanguageServer::ScopeData::Variable.constant_variables.where(name: name)
+      scopes = RubyLanguageServer::ScopeData::Scope.where(name:)
+      variables = RubyLanguageServer::ScopeData::Variable.constant_variables.where(name:)
       (scopes + variables).reject { |scope| scope.code_file.nil? }.map do |scope|
         Location.hash(scope.code_file.uri, scope.top_line, 1)
       end

data/lib/ruby_language_server/scope_data/scope.rb

@@ -12,6 +12,8 @@ module RubyLanguageServer
       belongs_to :parent, class_name: 'Scope', optional: true
       has_many :children, class_name: 'Scope', foreign_key: :parent_id
 
+      validate :bottom_line_ge_top_line, unless: :root_scope?
+
       scope :method_scopes, -> { where(class_type: TYPE_METHOD) }
       scope :for_line, ->(line) { where('top_line <= ? AND bottom_line >= ?', line, line).or(where(parent_id: nil)) }
       scope :by_path_length, -> { order(Arel.sql('length(path) DESC')) }
@@ -25,10 +27,10 @@ module RubyLanguageServer
       def self.build(parent = nil, type = TYPE_ROOT, name = '', top_line = 1, column = 1)
         full_name = [parent ? parent.full_name : nil, name].compact.join(JoinHash[type])
         create!(
-          parent: parent,
-          top_line: top_line,
-          column: column,
-          name: name,
+          parent:,
+          top_line:,
+          column:,
+          name:,
           path: full_name,
           class_type: type
         )
@@ -77,11 +79,25 @@ module RubyLanguageServer
         [TYPE_MODULE, TYPE_CLASS, TYPE_METHOD, TYPE_VARIABLE].include?(class_type)
       end
 
+      # Called from ScopeParser when a peer of this block starts - because we don't have an end notifier.
+      # So we do some reasonable cleanup here.
+      def close(line)
+        return destroy! if block_scope? && variables.none?
+
+        self.top_line ||= variables.map(&:top_line).min
+        self.bottom_line = [bottom_line, line].compact.min
+        save!
+      end
+
       private
 
       def scope_parts
         path&.split(/#{JoinHash.values.reject(&:blank?).uniq.join('|')}/)
       end
+
+      def bottom_line_ge_top_line
+        errors.add(:bottom_line, 'must be greater than or equal to top line') if bottom_line && top_line && bottom_line < top_line
+      end
     end
   end
 end

data/lib/ruby_language_server/scope_data/variable.rb

@@ -15,10 +15,10 @@ module RubyLanguageServer
       def self.build(scope, name, line = 1, column = 1, type = TYPE_VARIABLE)
         path = [scope.full_name, name].join(JoinHash[TYPE_VARIABLE])
         create!(
-          line: line,
-          column: column,
-          name: name,
-          path: path,
+          line:,
+          column:,
+          name:,
+          path:,
           variable_type: type
         )
       end

data/lib/ruby_language_server/scope_parser.rb

@@ -17,9 +17,10 @@ module RubyLanguageServer
     include ScopeParserCommands::RubyCommands
     attr_reader :sexp, :lines, :current_scope
 
-    def initialize(sexp, lines = 1)
+    def initialize(sexp, lines = 1, shallow = false)
       @sexp = sexp
       @lines = lines
+      @shallow = shallow
       @root_scope = nil
     end
 
@@ -226,38 +227,6 @@ module RubyLanguageServer
           end
 
           [:def_with_access, klass, method_name, access, line]
-          # when 'scope', 'named_scope'
-          #   [:rails_def, :scope, args[1][0], line]
-          # when /^attr_(accessor|reader|writer)$/
-          #   gen_reader = Regexp.last_match(1) != 'writer'
-          #   gen_writer = Regexp.last_match(1) != 'reader'
-          #   args[1..-1].each_with_object([]) do |arg, gen|
-          #     gen << [:def, arg[0], line] if gen_reader
-          #     gen << [:def, "#{arg[0]}=", line] if gen_writer
-          #   end
-          # when 'has_many', 'has_and_belongs_to_many'
-          #   a = args[1][0]
-          #   kind = name.to_sym
-          #   gen = []
-          #   unless a.is_a?(Enumerable) && !a.is_a?(String)
-          #     a = a.to_s
-          #     gen << [:rails_def, kind, a, line]
-          #     gen << [:rails_def, kind, "#{a}=", line]
-          #     if (sing = a.chomp('s')) != a
-          #       # poor man's singularize
-          #       gen << [:rails_def, kind, "#{sing}_ids", line]
-          #       gen << [:rails_def, kind, "#{sing}_ids=", line]
-          #     end
-          #   end
-          #   gen
-          # when 'belongs_to', 'has_one'
-          #   a = args[1][0]
-          #   unless a.is_a?(Enumerable) && !a.is_a?(String)
-          #     kind = name.to_sym
-          #     %W[#{a} #{a}= build_#{a} create_#{a} create_#{a}!].inject([]) do |all, ident|
-          #       all << [:rails_def, kind, ident, line]
-          #     end
-          #   end
         end
       end
     end
@@ -265,19 +234,17 @@ module RubyLanguageServer
     private
 
     def add_variable(name, line, column, scope = @current_scope)
-      newvar = scope.variables.where(name: name).first_or_create!(
-        line: line,
-        column: column,
+      return if @shallow
+
+      newvar = scope.variables.where(name:).first_or_create!(
+        line:,
+        column:,
         code_file: scope.code_file
       )
       if scope.top_line.blank?
         scope.top_line = line
         scope.save!
       end
-      # new_variable = ScopeData::Variable.build(scope, name, line, column)
-      # # blocks don't declare their first line in the parser
-      # scope.top_line ||= line
-      # scope.variables << new_variable unless scope.has_variable_or_constant?(new_variable)
       newvar
     end
 
@@ -295,7 +262,11 @@ module RubyLanguageServer
     def add_scope(args, rest, type)
       (_, name, (line, column)) = args
       scope = push_scope(type, name, line, column)
-      process(rest)
+      if type == ScopeData::Scope::TYPE_METHOD && @shallow
+        process([])
+      else
+        process(rest)
+      end
       pop_scope
       scope
     end
@@ -316,10 +287,7 @@ module RubyLanguageServer
     # The notion is that when you start the next scope, all the previous peers and unclosed descendents of the previous peer should be closed.
     def close_sibling_scopes(line)
       parent_scope = @current_scope
-      parent_scope&.descendants&.each do |scope|
-        scope.bottom_line = [scope.bottom_line, line - 1].compact.min
-        scope.save!
-      end
+      parent_scope&.descendants&.each { |scope| scope.close(line) }
     end
 
     def pop_scope
@@ -333,14 +301,14 @@ module RubyLanguageServer
   class ScopeParser < Ripper
     attr_reader :root_scope
 
-    def initialize(text)
+    def initialize(text, shallow = false)
       text ||= '' # empty is the same as nil - but it doesn't crash
       begin
         sexp = self.class.sexp(text)
       rescue TypeError => e
         RubyLanguageServer.logger.error("Exception in sexp: #{e} for text: #{text}")
       end
-      processor = SEXPProcessor.new(sexp, text.split("\n").length)
+      processor = SEXPProcessor.new(sexp, text.split("\n").length, shallow)
       @root_scope = processor.root_scope
     end
   end

data/lib/ruby_language_server/server.rb

@@ -17,7 +17,7 @@ module RubyLanguageServer
       root_path = params['rootPath']
       root_uri = params['rootUri']
       @project_manager = ProjectManager.new(root_path, root_uri)
-      @project_manager.scan_all_project_files(@mutex)
+      @project_manager.scan_all_project_files
       gem_string = ENV.fetch('ADDITIONAL_GEMS', nil)
       gem_array = (gem_string.split(',').compact.map(&:strip).reject { |string| string == '' } if gem_string && !gem_string.empty?)
       @project_manager.install_additional_gems(gem_array)
@@ -85,7 +85,7 @@ module RubyLanguageServer
 
     def send_diagnostics(uri, text)
       hash = @project_manager.update_document_content(uri, text)
-      io.send_notification('textDocument/publishDiagnostics', uri: uri, diagnostics: hash)
+      io.send_notification('textDocument/publishDiagnostics', uri:, diagnostics: hash)
     end
 
     def on_textDocument_didOpen(params)

data/lib/ruby_language_server/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module RubyLanguageServer
-  VERSION = '0.3.16'
+  VERSION = '0.3.17'
 end

data/ruby_language_server.gemspec

@@ -11,10 +11,10 @@ Gem::Specification.new do |spec|
   spec.email         = ['kurt@CircleW.org']
 
   spec.summary       = 'Provide a language server implementation for ruby in ruby.'
-  spec.description   = 'See https://microsoft.github.io/language-server-protocol/ "A Language Server is meant to provide the language-specific smarts and communicate with development tools over a protocol that enables inter-process communication."'
+  spec.description   = 'Provide a language server implementation for ruby in ruby.  See https://microsoft.github.io/language-server-protocol/ "A Language Server is meant to provide the language-specific smarts and communicate with development tools over a protocol that enables inter-process communication."'
   spec.homepage      = 'https://github.com/kwerle/ruby_language_server'
   spec.license       = 'MIT'
-  spec.required_ruby_version = '>=2.7.0'
+  spec.required_ruby_version = '>=3.1.0'
 
   # Prevent pushing this gem to RubyGems.org. To allow pushes either set the 'allowed_push_host'
   # to allow pushing to a single host or delete this section to allow pushing to any host.
@@ -24,7 +24,7 @@ Gem::Specification.new do |spec|
     spec.metadata['changelog_uri'] = 'https://github.com/kwerle/ruby_language_server/blob/develop/CHANGELOG.txt'
   else
     raise 'RubyGems 2.0 or newer is required to protect against ' \
-      'public gem pushes.'
+          'public gem pushes.'
   end
 
   # Specify which files should be added to the gem when it is released.
@@ -40,23 +40,25 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'json'
 
   # No - do not put these in dev - they are needed for the app
-  spec.add_dependency 'rubocop'
+  spec.add_dependency 'rubocop', '>1.38.0' # Something broke in 1.38.0.  Move to rubocop --server?
+  spec.add_dependency 'rubocop-ast', '>1.32.0' # Something broke in 1.38.0.  Move to rubocop --server?
   spec.add_dependency 'rubocop-performance' # Linter - no longer needed - use additional gems?
   spec.add_dependency 'rubocop-rspec'       # Linter - no longer needed - use additional gems?
 
   spec.add_dependency 'amatch'      # in c
   spec.add_dependency 'fuzzy_match' # completion matching
 
-  spec.add_dependency 'activerecord', '~>6.1'
-  spec.add_dependency 'sqlite3'
+  spec.add_dependency 'activerecord', '~>7.0'
+  spec.add_dependency 'sqlite3', '<1.5.0' # 1.5.0 breaks in docker M1 at least
 
+  spec.add_development_dependency 'byebug'
   spec.add_development_dependency 'guard'
   spec.add_development_dependency 'guard-minitest'
   spec.add_development_dependency 'guard-rubocop'
   spec.add_development_dependency 'minitest'
   spec.add_development_dependency 'minitest-reporters'
-  spec.add_development_dependency 'pry'
-  spec.add_development_dependency 'pry-byebug'
   spec.add_development_dependency 'rake' # required by guard :-(
-  spec.add_development_dependency 'sexp_processor'
+  spec.add_development_dependency 'rubocop-minitest'
+  spec.add_development_dependency 'rubocop-rake'
+  spec.metadata['rubygems_mfa_required'] = 'true'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby_language_server
 version: !ruby/object:Gem::Version
-  version: 0.3.16
+  version: 0.3.17
 platform: ruby
 authors:
 - Kurt Werle
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-06-12 00:00:00.000000000 Z
+date: 2024-08-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -56,16 +56,30 @@ dependencies:
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ">"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.38.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ">"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.38.0
+- !ruby/object:Gem::Dependency
+  name: rubocop-ast
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">"
+      - !ruby/object:Gem::Version
+        version: 1.32.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">"
+      - !ruby/object:Gem::Version
+        version: 1.32.0
 - !ruby/object:Gem::Dependency
   name: rubocop-performance
   requirement: !ruby/object:Gem::Requirement
@@ -128,30 +142,30 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '7.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '7.0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.5.0
 - !ruby/object:Gem::Dependency
-  name: guard
+  name: byebug
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -165,7 +179,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: guard-minitest
+  name: guard
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -179,7 +193,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: guard-rubocop
+  name: guard-minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -193,7 +207,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: minitest
+  name: guard-rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -207,7 +221,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: minitest-reporters
+  name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -221,7 +235,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: pry
+  name: minitest-reporters
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -235,7 +249,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: pry-byebug
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -249,7 +263,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: rubocop-minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -263,7 +277,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: sexp_processor
+  name: rubocop-rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -276,9 +290,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: See https://microsoft.github.io/language-server-protocol/ "A Language
-  Server is meant to provide the language-specific smarts and communicate with development
-  tools over a protocol that enables inter-process communication."
+description: Provide a language server implementation for ruby in ruby.  See https://microsoft.github.io/language-server-protocol/
+  "A Language Server is meant to provide the language-specific smarts and communicate
+  with development tools over a protocol that enables inter-process communication."
 email:
 - kurt@CircleW.org
 executables:
@@ -332,6 +346,7 @@ metadata:
   homepage_uri: https://github.com/kwerle/ruby_language_server
   source_code_uri: https://github.com/kwerle/ruby_language_server
   changelog_uri: https://github.com/kwerle/ruby_language_server/blob/develop/CHANGELOG.txt
+  rubygems_mfa_required: 'true'
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -340,14 +355,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.7.0
+      version: 3.1.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.15
+rubygems_version: 3.5.11
 signing_key:
 specification_version: 4
 summary: Provide a language server implementation for ruby in ruby.