Merge pull request #263 from Shopify/andyw8/handle-apps-without-activerecord

andyw8 · web-flow · commit 3df6a98602c9 · 2024-02-20T13:35:19.000-05:00
Handle apps without ActiveRecord
diff --git a/lib/ruby_lsp/ruby_lsp_rails/server.rb b/lib/ruby_lsp/ruby_lsp_rails/server.rb
@@ -29,7 +29,7 @@ class Server
       sig { params(model_name: String).returns(T.nilable(T::Hash[Symbol, T.untyped])) }
       def resolve_database_info_from_model(model_name)
         const = ActiveSupport::Inflector.safe_constantize(model_name)
-        unless const && const < ActiveRecord::Base && !const.abstract_class?
+        unless const && defined?(ActiveRecord) && const < ActiveRecord::Base && !const.abstract_class?
           return {
             result: nil,
           }

Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ class Server`
`29`	`29`	`sig { params(model_name: String).returns(T.nilable(T::Hash[Symbol, T.untyped])) }`
`30`	`30`	`def resolve_database_info_from_model(model_name)`
`31`	`31`	`const = ActiveSupport::Inflector.safe_constantize(model_name)`
`32`		`- unless const && const < ActiveRecord::Base && !const.abstract_class?`
	`32`	`+ unless const && defined?(ActiveRecord) && const < ActiveRecord::Base && !const.abstract_class?`
`33`	`33`	`return {`
`34`	`34`	`result: nil,`
`35`	`35`	`}`