solargraph 0.46.0 → 0.54.5

data/lib/solargraph.rb

@@ -1,69 +1,72 @@
-# frozen_string_literal: true
-
-Encoding.default_external = 'UTF-8'
-
-require 'solargraph/compat'
-require 'solargraph/version'
-
-# The top-level namespace for the Solargraph code mapping, documentation,
-# static analysis, and language server libraries.
-#
-module Solargraph
-  class InvalidOffsetError         < RangeError;    end
-  class DiagnosticsError           < RuntimeError;  end
-  class FileNotFoundError          < RuntimeError;  end
-  class SourceNotAvailableError    < StandardError; end
-  class ComplexTypeError           < StandardError; end
-  class WorkspaceTooLargeError     < RuntimeError;  end
-  class BundleNotFoundError        < StandardError; end
-  class InvalidRubocopVersionError < RuntimeError;  end
-
-  autoload :Position,         'solargraph/position'
-  autoload :Range,            'solargraph/range'
-  autoload :Location,         'solargraph/location'
-  autoload :Shell,            'solargraph/shell'
-  autoload :Source,           'solargraph/source'
-  autoload :SourceMap,        'solargraph/source_map'
-  autoload :ApiMap,           'solargraph/api_map'
-  autoload :YardMap,          'solargraph/yard_map'
-  autoload :Pin,              'solargraph/pin'
-  autoload :ServerMethods,    'solargraph/server_methods'
-  autoload :LanguageServer,   'solargraph/language_server'
-  autoload :Workspace,        'solargraph/workspace'
-  autoload :Page,             'solargraph/page'
-  autoload :Library,          'solargraph/library'
-  autoload :Diagnostics,      'solargraph/diagnostics'
-  autoload :ComplexType,      'solargraph/complex_type'
-  autoload :Bench,            'solargraph/bench'
-  autoload :Logging,          'solargraph/logging'
-  autoload :TypeChecker,      'solargraph/type_checker'
-  autoload :Environ,          'solargraph/environ'
-  autoload :Convention,       'solargraph/convention'
-  autoload :Documentor,       'solargraph/documentor'
-  autoload :Parser,           'solargraph/parser'
-
-  dir = File.dirname(__FILE__)
-  YARDOC_PATH = File.realpath(File.join(dir, '..', 'yardoc'))
-  YARD_EXTENSION_FILE = File.join(dir, 'yard-solargraph.rb')
-  VIEWS_PATH = File.join(dir, 'solargraph', 'views')
-
-  # A convenience method for Solargraph::Logging.logger.
-  #
-  # @return [Logger]
-  def self.logger
-    Solargraph::Logging.logger
-  end
-
-  # A helper method that runs Bundler.with_unbundled_env or falls back to
-  # Bundler.with_clean_env for earlier versions of Bundler.
-  #
-  # @return [void]
-  def self.with_clean_env &block
-    meth = if Bundler.respond_to?(:with_original_env)
-      :with_original_env
-    else
-      :with_clean_env
-    end
-    Bundler.send meth, &block
-  end
-end
+# frozen_string_literal: true
+
+Encoding.default_external = 'UTF-8'
+
+require 'set'
+require 'yard-solargraph'
+require 'solargraph/yard_tags'
+require 'solargraph/version'
+
+# The top-level namespace for the Solargraph code mapping, documentation,
+# static analysis, and language server libraries.
+#
+module Solargraph
+  class InvalidOffsetError         < RangeError;    end
+  class DiagnosticsError           < RuntimeError;  end
+  class FileNotFoundError          < RuntimeError;  end
+  class SourceNotAvailableError    < StandardError; end
+  class ComplexTypeError           < StandardError; end
+  class WorkspaceTooLargeError     < RuntimeError;  end
+  class BundleNotFoundError        < StandardError; end
+  class InvalidRubocopVersionError < RuntimeError;  end
+
+  autoload :Position,         'solargraph/position'
+  autoload :Range,            'solargraph/range'
+  autoload :Location,         'solargraph/location'
+  autoload :Shell,            'solargraph/shell'
+  autoload :Source,           'solargraph/source'
+  autoload :SourceMap,        'solargraph/source_map'
+  autoload :ApiMap,           'solargraph/api_map'
+  autoload :Yardoc,           'solargraph/yardoc'
+  autoload :YardMap,          'solargraph/yard_map'
+  autoload :Pin,              'solargraph/pin'
+  autoload :DocMap,           'solargraph/doc_map'
+  autoload :ServerMethods,    'solargraph/server_methods'
+  autoload :LanguageServer,   'solargraph/language_server'
+  autoload :Workspace,        'solargraph/workspace'
+  autoload :Page,             'solargraph/page'
+  autoload :Library,          'solargraph/library'
+  autoload :Diagnostics,      'solargraph/diagnostics'
+  autoload :ComplexType,      'solargraph/complex_type'
+  autoload :Bench,            'solargraph/bench'
+  autoload :Logging,          'solargraph/logging'
+  autoload :TypeChecker,      'solargraph/type_checker'
+  autoload :Environ,          'solargraph/environ'
+  autoload :Equality,         'solargraph/equality'
+  autoload :Convention,       'solargraph/convention'
+  autoload :Parser,           'solargraph/parser'
+  autoload :RbsMap,           'solargraph/rbs_map'
+  autoload :GemPins,          'solargraph/gem_pins'
+  autoload :Cache,            'solargraph/cache'
+
+  dir = File.dirname(__FILE__)
+  VIEWS_PATH = File.join(dir, 'solargraph', 'views')
+
+  # A convenience method for Solargraph::Logging.logger.
+  #
+  # @return [Logger]
+  def self.logger
+    Solargraph::Logging.logger
+  end
+
+  # A helper method that runs Bundler.with_unbundled_env or falls back to
+  # Bundler.with_clean_env for earlier versions of Bundler.
+  def self.with_clean_env &block
+    meth = if Bundler.respond_to?(:with_original_env)
+      :with_original_env
+    else
+      :with_clean_env
+    end
+    Bundler.send meth, &block
+  end
+end

data/solargraph.gemspec

@@ -13,30 +13,41 @@ Gem::Specification.new do |s|
   s.files       = Dir.chdir(File.expand_path('..', __FILE__)) do
     `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
   end
-  s.homepage    = 'http://solargraph.org'
+  s.homepage    = 'https://solargraph.org'
   s.license     = 'MIT'
   s.executables = ['solargraph']
+  s.metadata["funding_uri"]     = "https://www.patreon.com/castwide"
+  s.metadata["bug_tracker_uri"] = "https://github.com/castwide/solargraph/issues"
+  s.metadata["changelog_uri"]   = "https://github.com/castwide/solargraph/blob/master/CHANGELOG.md"
+  s.metadata["source_code_uri"] = "https://github.com/castwide/solargraph"
 
-  s.required_ruby_version = '>= 2.4'
+  s.required_ruby_version = '>= 3.0'
 
   s.add_runtime_dependency 'backport', '~> 1.2'
-  s.add_runtime_dependency 'benchmark'
-  s.add_runtime_dependency 'bundler', '>= 1.17.2'
+  s.add_runtime_dependency 'benchmark', '~> 0.4'
+  s.add_runtime_dependency 'bundler', '~> 2.0'
   s.add_runtime_dependency 'diff-lcs', '~> 1.4'
-  s.add_runtime_dependency 'e2mmap'
-  s.add_runtime_dependency 'jaro_winkler', '~> 1.5'
+  s.add_runtime_dependency 'jaro_winkler', '~> 1.6', '>= 1.6.1'
   s.add_runtime_dependency 'kramdown', '~> 2.3'
   s.add_runtime_dependency 'kramdown-parser-gfm', '~> 1.1'
+  s.add_runtime_dependency 'logger', '~> 1.6'
+  s.add_runtime_dependency 'observer', '~> 0.1'
+  s.add_runtime_dependency 'ostruct', '~> 0.6'
   s.add_runtime_dependency 'parser', '~> 3.0'
-  s.add_runtime_dependency 'reverse_markdown', '>= 1.0.5', '< 3'
-  s.add_runtime_dependency 'rubocop', '>= 0.52'
+  s.add_runtime_dependency 'rbs', '~> 3.3'
+  s.add_runtime_dependency 'reverse_markdown', '~> 3.0'
+  s.add_runtime_dependency 'rubocop', '~> 1.38'
   s.add_runtime_dependency 'thor', '~> 1.0'
   s.add_runtime_dependency 'tilt', '~> 2.0'
   s.add_runtime_dependency 'yard', '~> 0.9', '>= 0.9.24'
+  s.add_runtime_dependency 'yard-solargraph', '~> 0.1'
 
-  s.add_development_dependency 'pry'
+  s.add_development_dependency 'pry', '~> 0.15'
   s.add_development_dependency 'public_suffix', '~> 3.1'
-  s.add_development_dependency 'rspec', '~> 3.5', '>= 3.5.0'
+  s.add_development_dependency 'rake', '~> 13.2'
+  s.add_development_dependency 'rspec', '~> 3.5'
   s.add_development_dependency 'simplecov', '~> 0.14'
   s.add_development_dependency 'webmock', '~> 3.6'
+  # work around missing yard dependency needed as of Ruby 3.5
+  s.add_development_dependency 'irb', '~> 1.15'
 end