ruby-lsp-cell 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d26cf866d9c38fe88db134b7da05d7c883aa8cab0907b064042ef41a01dce7c7
-  data.tar.gz: d91237300c2695320827a43142dcb84d3392d66486fa72a6f7df16750f490743
+  metadata.gz: af2de44e3dcfc2374fd50bfcfe41227029465fdfc55a4af05a4f9bf478681ca3
+  data.tar.gz: 79d0086b44a359a5473a50950149df9d2465f0cbe92364cdeb357a0c7eb0c9d4
 SHA512:
-  metadata.gz: 3d0b35cd0593bcdc3c71cb18c19c7ffd8202763ce75a26389c1538e6f5ab4650e8996c69efcd8a16dd6e31e3d9c1b7013d869759b1a0bd922fec4f71a384f2be
-  data.tar.gz: 46d0d9e866cdc4a8a0a75f6b930a31d40861616f5f2212069937cfdd4ba3a7077fe542b2b398f0dca1f6b5b9aa9d1a2a113c4bb5eeda349f03f3b86dc679f1dc
+  metadata.gz: 4794c22ccc66ac0d1f7bc8d4cd3bc81c68faa9f37eb1d7138491cb524c59c16e49ff28c22fbffb9ede5240343b3ec868b6a48c736fef0037e0fed2b7802b92a4
+  data.tar.gz: 79fe3cb7d38cd34e5491458d92788512f0892091fde0ed20606a103b955795c0d8499071a609b08fd47f372dd7036ec6f59c1dc593013d6ce07068d9b081872a

data/lib/ruby_lsp/cell/version.rb

@@ -3,6 +3,6 @@
 
 module RubyLsp
   module Cell
-    VERSION = "0.1.2"
+    VERSION = "0.1.3"
   end
 end

data/lib/ruby_lsp/ruby-lsp-cell/addon.rb

@@ -29,6 +29,8 @@ module RubyLsp
 
       sig { params(global_state: RubyLsp::GlobalState, message_queue: Thread::Queue).void }
       def activate(global_state, message_queue)
+        return unless are_required_libraries_installed?
+
         @message_queue = message_queue
         @global_state = global_state
         @settings = @global_state.settings_for_addon(name) || {}
@@ -66,6 +68,14 @@ module RubyLsp
       def version
         RubyLsp::Cell::VERSION
       end
+
+      def are_required_libraries_installed?
+        Bundler.definition.specs.any? do |spec|
+          spec.name == "cells"
+        end
+      rescue Bundler::GemNotFound
+        false
+      end
     end
   end
 end

data/lib/ruby_lsp/ruby-lsp-cell/code_lens.rb

@@ -9,14 +9,12 @@ module RubyLsp
 
       include ::RubyLsp::Requests::Support::Common
 
-      REQUIRED_LIBRARY = T.let("cells-rails", String)
-
       ResponseType = type_member { { fixed: T::Array[CodeRay] } }
 
       sig do
         params(
           response_builder: RubyLsp::ResponseBuilders::CollectionResponseBuilder,
-          uri: URI::Generic,
+          uri: URI::File,
           dispatcher: Prism::Dispatcher,
           global_state: RubyLsp::GlobalState,
           enabled: T::Boolean,
@@ -33,28 +31,49 @@ module RubyLsp
         @class_name = T.let("", String)
         @pattern = T.let("_cell", String)
         @default_view_filename = T.let(default_view_filename, String)
-        dispatcher.register(self, :on_class_node_enter, :on_def_node_leave)
+        @in_cell_class = T.let(false, T::Boolean)
+        @nesting = T.let([], T::Array[String])
+        dispatcher.register(
+          self,
+          :on_module_node_enter,
+          :on_module_node_leave,
+          :on_class_node_enter,
+          :on_class_node_leave,
+          :on_def_node_enter,
+        )
+      end
+
+      sig { params(node: Prism::ModuleNode).void }
+      def on_module_node_enter(node)
+        @nesting.push(node.constant_path.slice)
+      end
+
+      sig { params(node: Prism::ModuleNode).void }
+      def on_module_node_leave(node)
+        @nesting.pop
       end
 
       sig { params(node: Prism::ClassNode).void }
       def on_class_node_enter(node)
-        @class_name = node.constant_path.slice
-        return unless @class_name.end_with?("Cell")
-        return unless @global_state.index.linearized_ancestors_of(@class_name).include?("Cell::ViewModel")
+        @nesting.push(node.constant_path.slice)
+        class_name = @nesting.join("::")
+        return unless class_name.end_with?("Cell")
+        return unless @global_state.index.linearized_ancestors_of(class_name).include?("Cell::ViewModel")
 
+        @in_cell_class = true
         add_default_goto_code_lens(node)
       end
 
       sig { params(node: Prism::ClassNode).void }
       def on_class_node_leave(node)
-        @class_name = ""
+        @nesting.pop
+        @in_cell_class = false
       end
 
       sig { params(node: Prism::DefNode).void }
-      def on_def_node_leave(node)
-        return unless @class_name.end_with?("Cell")
+      def on_def_node_enter(node)
+        return unless @in_cell_class
         return unless contains_render_call?(node.body)
-        return unless @global_state.index.linearized_ancestors_of(@class_name).include?("Cell::ViewModel")
 
         add_function_goto_code_lens(node, node.name.to_s)
       end
@@ -63,44 +82,27 @@ module RubyLsp
 
       sig { params(node: Prism::Node).void }
       def add_default_goto_code_lens(node)
-        return unless are_required_libraries_installed?
-
         erb_filename = remove_last_pattern_in_string @default_view_filename, ".erb"
         uri = compute_erb_view_path @default_view_filename
 
-        @response_builder << create_code_lens(
-          node,
-          title: "Go to #{erb_filename}",
-          command_name: "vscode.open",
-          arguments: [uri],
-          data: { type: "goToFile" },
-        )
+        create_go_to_file_code_lens(node, erb_filename, uri)
       end
 
       sig { params(node: T.nilable(Prism::Node)).returns(T::Boolean) }
       def contains_render_call?(node)
         return false if node.nil?
 
-        return true if node.is_a?(Prism::CallNode) &&
-          node.receiver.nil? &&
-          node.message == "render"
+        if node.is_a?(Prism::CallNode)
+          return true if node.receiver.nil? && node.name == :render
+        end
 
         node.child_nodes.any? { |child| contains_render_call?(child) }
       end
 
       sig { params(node: Prism::Node, name: String).void }
       def add_function_goto_code_lens(node, name)
-        return unless are_required_libraries_installed?
-
         uri = compute_erb_view_path("#{name}.erb")
-
-        @response_builder << create_code_lens(
-          node,
-          title: "Go to #{name}",
-          command_name: "vscode.open",
-          arguments: [uri],
-          data: { type: "goToFile" },
-        )
+        create_go_to_file_code_lens(node, name, uri)
       end
 
       sig { params(string: String, pattern: String).returns(String) }
@@ -113,12 +115,20 @@ module RubyLsp
         escaped_pattern = Regexp.escape(@pattern)
         base_path = @path.sub(/#{escaped_pattern}\.rb$/, "")
         folder = File.basename(base_path)
-        File.join(File.dirname(base_path), folder, name)
+        path = File.join(File.dirname(base_path), folder, name)
+        uri = URI::File.from_path(path: path).to_s
+        uri
       end
 
-      sig { returns(T::Boolean) }
-      def are_required_libraries_installed?
-        Bundler.locked_gems.dependencies.keys.include?(REQUIRED_LIBRARY)
+      sig { params(node: Prism::Node, name: String, uri: String).void }
+      def create_go_to_file_code_lens(node, name, uri)
+        @response_builder << create_code_lens(
+          node,
+          title: "Go to #{name}",
+          command_name: "rubyLsp.openFile",
+          arguments: [[uri]],
+          data: { type: "file" },
+        )
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby-lsp-cell
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Edgar Guzmán