-
Notifications
You must be signed in to change notification settings - Fork 30
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Enhance schema hover link to jump to the right table #212
Open
faraazahmad
wants to merge
12
commits into
Shopify:main
Choose a base branch
from
faraazahmad:schema-collector
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
12 commits
Select commit
Hold shift + click to select a range
60cc1fe
Add schema collector
faraazahmad abe9229
add types
faraazahmad 77da138
fix operator typo
faraazahmad e3f748f
add RubyLsp::Rails module
faraazahmad 3d9b762
incorporate changes by @wbhouston
faraazahmad 63bf2c1
fix schema collector test
faraazahmad da54d63
fix rack app test
faraazahmad 4d97874
Update lib/ruby_lsp/ruby_lsp_rails/hover.rb
faraazahmad 5f65cb9
fix: address comments
faraazahmad 633edc5
Fix typing and linting
andyw8 0e414a7
fix: move schema file into class
faraazahmad c24d3d5
Update lib/ruby_lsp/ruby_lsp_rails/hover.rb
faraazahmad File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,40 @@ | ||
# typed: strict | ||
# frozen_string_literal: true | ||
|
||
module RubyLsp | ||
module Rails | ||
class SchemaCollector < Prism::Visitor | ||
extend T::Sig | ||
|
||
sig { returns(T::Hash[String, Prism::Location]) } | ||
attr_reader :tables | ||
|
||
sig { params(project_root: Pathname).void } | ||
def initialize(project_root) | ||
super() | ||
|
||
@tables = T.let({}, T::Hash[String, Prism::Location]) | ||
@schema_path = T.let(project_root.join("db", "schema.rb").to_s, String) | ||
end | ||
|
||
sig { void } | ||
def parse_schema | ||
parse_result = Prism.parse_file(@schema_path) | ||
parse_result.value.accept(self) | ||
end | ||
|
||
sig { params(node: Prism::CallNode).void } | ||
def visit_call_node(node) | ||
if node.message == "create_table" | ||
first_argument = node.arguments&.arguments&.first | ||
|
||
if first_argument&.is_a?(Prism::StringNode) | ||
@tables[first_argument.content] = node.location | ||
end | ||
end | ||
|
||
super | ||
end | ||
end | ||
end | ||
end |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,27 @@ | ||
# typed: true | ||
# frozen_string_literal: true | ||
|
||
require "test_helper" | ||
|
||
module RubyLsp | ||
module Rails | ||
class SchemaCollectorTest < ActiveSupport::TestCase | ||
SCHEMA_FILE = <<~RUBY | ||
ActiveRecord::Schema[7.1].define(version: 2023_12_09_114241) do | ||
create_table "cats", force: :cascade do |t| | ||
end | ||
|
||
create_table "dogs", force: :cascade do |t| | ||
end | ||
end | ||
RUBY | ||
|
||
test "store locations of models by parsing create_table calls" do | ||
collector = RubyLsp::Rails::SchemaCollector.new(Pathname.new("example_app")) | ||
Prism.parse(SCHEMA_FILE).value.accept(collector) | ||
|
||
assert_equal(["cats", "dogs"], collector.tables.keys) | ||
end | ||
end | ||
end | ||
end |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This isn't quite right as some apps use
structure.sql
instead.If you search you'll see we use
schema_dump_path
elsewhere to get the path.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This means this collector will need to communicate with the server. The path for the schema is unlikely to change, so maybe there's room for a refactor where we fetch the schema path once and reuse it here and in hover.
Maybe we can move forward with this and simply not populate anything if
db/schema.rb
doesn't exist? That way we can provide the feature for schema users and enhance it later.