Skip to content

fix: Follow SCIP spec for locals syntax #240

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.

Sign up for GitHub

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

Merged
merged 1 commit into from
Nov 7, 2025
Merged

fix: Follow SCIP spec for locals syntax #240

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion scip_indexer/SCIPIndexer.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ struct OwnedLocal {
string toSCIPString(const core::GlobalState &gs, core::FileRef file) {
// 32-bits => if there are 10k methods in a single file, the chance of at least one
// colliding pair is about 1.1%, assuming even distribution. That seems OK.
return fmt::format("local {}~#{}", counter, ::fnv1a_32(owner.name(gs).show(gs)));
return fmt::format("local {}${}", counter, ::fnv1a_32(owner.name(gs).show(gs)));
}
};

Expand Down
6 changes: 3 additions & 3 deletions test/scip/testdata/alias.snapshot.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,9 @@ module Mod2

def myfunction(myparam)
# ^^^^^^^^^^ definition [..] Object#myfunction().
# ^^^^^^^ definition local 1~#3083414419
# ^^^^^^^ definition local 1$3083414419
myparam + Mod2::FEG
# ^^^^^^^ reference local 1~#3083414419
# ^^^^^^^ reference local 1$3083414419
# ^^^^ reference [..] Mod2#
# ^^^ reference [..] Mod2#FEG.
end
Expand Down Expand Up @@ -70,7 +70,7 @@ class X < T::Enum
# ^^^ definition [..] X#All.
# ^ reference [..] X#A.
# ^ reference [..] X#B.
# ^^^^^^^^ definition local 4~#119448696
# ^^^^^^^^ definition local 4$119448696
# ^ reference [..] X#
end

Expand Down
46 changes: 23 additions & 23 deletions test/scip/testdata/args.snapshot.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,52 +2,52 @@

def args(x, y)
# ^^^^ definition [..] Object#args().
# ^ definition local 1~#2634721084
# ^ definition local 2~#2634721084
# ^ definition local 1$2634721084
# ^ definition local 2$2634721084
z = x + y
# ^ definition local 3~#2634721084
# ^ reference local 1~#2634721084
# ^ reference local 2~#2634721084
# ^ definition local 3$2634721084
# ^ reference local 1$2634721084
# ^ reference local 2$2634721084
if x == 2
# ^ reference local 1~#2634721084
# ^ reference local 1$2634721084
# ^^ reference [..] BasicObject#`==`().
z += y
# ^ reference (write) local 3~#2634721084
# ^ reference local 3~#2634721084
# ^ reference local 2~#2634721084
# ^ reference (write) local 3$2634721084
# ^ reference local 3$2634721084
# ^ reference local 2$2634721084
else
z += x
# ^ reference (write) local 3~#2634721084
# ^ reference local 3~#2634721084
# ^ reference local 1~#2634721084
# ^ reference (write) local 3$2634721084
# ^ reference local 3$2634721084
# ^ reference local 1$2634721084
end
z
# ^ reference local 3~#2634721084
# ^ reference local 3$2634721084
end

def keyword_args(w:, x: 3, y: [], **kwargs)
# ^^^^^^^^^^^^ definition [..] Object#keyword_args().
# ^^ definition local 1~#3526982640
# ^^ definition local 2~#3526982640
# ^^ definition local 3~#3526982640
# ^^ definition local 1$3526982640
# ^^ definition local 2$3526982640
# ^^ definition local 3$3526982640
y << w + x
# ^ reference local 3~#3526982640
# ^ reference local 1~#3526982640
# ^ reference local 2~#3526982640
# ^ reference local 3$3526982640
# ^ reference local 1$3526982640
# ^ reference local 2$3526982640
y << [a]
# ^ reference local 3~#3526982640
# ^ reference local 3$3526982640
return
end

def use_kwargs
# ^^^^^^^^^^ definition [..] Object#use_kwargs().
h = { a: 3 }
# ^ definition local 1~#571973038
# ^ definition local 1$571973038
keyword_args(w: 0, **h)
# ^^^^^^^^^^^^ reference [..] Object#keyword_args().
# ^ reference local 1~#571973038
# ^ reference local 1$571973038
keyword_args(w: 0, x: 1, y: [2], **h)
# ^^^^^^^^^^^^ reference [..] Object#keyword_args().
# ^ reference local 1~#571973038
# ^ reference local 1$571973038
return
end
26 changes: 13 additions & 13 deletions test/scip/testdata/arrays.snapshot.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,22 +2,22 @@

def arrays(a, i)
# ^^^^^^ definition [..] Object#arrays().
# ^ definition local 1~#513334479
# ^ definition local 2~#513334479
# ^ definition local 1$513334479
# ^ definition local 2$513334479
a[0] = 0
# ^ reference local 1~#513334479
# ^ reference local 1$513334479
a[1] = a[2]
# ^ reference local 1~#513334479
# ^ reference local 1~#513334479
# ^ reference local 1$513334479
# ^ reference local 1$513334479
a[i] = a[i + 1]
# ^ reference local 1~#513334479
# ^ reference local 2~#513334479
# ^ reference local 1~#513334479
# ^ reference local 2~#513334479
# ^ reference local 1$513334479
# ^ reference local 2$513334479
# ^ reference local 1$513334479
# ^ reference local 2$513334479
b = a[2..-1]
# ^ definition local 3~#513334479
# ^ reference local 1~#513334479
# ^ definition local 3$513334479
# ^ reference local 1$513334479
a << a[-1]
# ^ reference local 1~#513334479
# ^ reference local 1~#513334479
# ^ reference local 1$513334479
# ^ reference local 1$513334479
end
146 changes: 73 additions & 73 deletions test/scip/testdata/blocks_lambdas_procs.snapshot.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,161 +3,161 @@
def blk
# ^^^ definition [..] Object#blk().
y = 0
# ^ definition local 1~#1472469056
# ^ definition local 1$1472469056
[].each { |x|
# ^ definition local 2~#1472469056
# ^ definition local 2$1472469056
y += x
# ^ reference (write) local 1~#1472469056
# ^ reference local 1~#1472469056
# ^^^^^^ reference local 1~#1472469056
# ^ reference local 2~#1472469056
# ^ reference (write) local 1$1472469056
# ^ reference local 1$1472469056
# ^^^^^^ reference local 1$1472469056
# ^ reference local 2$1472469056
}
[].each do |x|
# ^ definition local 3~#1472469056
# ^ definition local 3$1472469056
y += x
# ^ reference (write) local 1~#1472469056
# ^ reference local 1~#1472469056
# ^^^^^^ reference local 1~#1472469056
# ^ reference local 3~#1472469056
# ^ reference (write) local 1$1472469056
# ^ reference local 1$1472469056
# ^^^^^^ reference local 1$1472469056
# ^ reference local 3$1472469056
end
end

def lam
# ^^^ definition [..] Object#lam().
y = 0
# ^ definition local 1~#1499497673
# ^ definition local 1$1499497673
l1 = ->(x) {
# ^^ definition local 4~#1499497673
# ^^ definition local 4$1499497673
# ^^ reference [..] Kernel#
# ^^ reference [..] Kernel#lambda().
# ^ definition local 3~#1499497673
# ^ definition local 3$1499497673
y += x
# ^ reference (write) local 1~#1499497673
# ^ reference local 1~#1499497673
# ^^^^^^ reference local 1~#1499497673
# ^ reference local 3~#1499497673
# ^ reference (write) local 1$1499497673
# ^ reference local 1$1499497673
# ^^^^^^ reference local 1$1499497673
# ^ reference local 3$1499497673
}
l2 = lambda { |x|
# ^^ definition local 6~#1499497673
# ^^ definition local 6$1499497673
# ^^^^^^ reference [..] Kernel#lambda().
# ^ definition local 5~#1499497673
# ^ definition local 5$1499497673
y += x
# ^ reference (write) local 1~#1499497673
# ^ reference local 1~#1499497673
# ^^^^^^ reference local 1~#1499497673
# ^ reference local 5~#1499497673
# ^ reference (write) local 1$1499497673
# ^ reference local 1$1499497673
# ^^^^^^ reference local 1$1499497673
# ^ reference local 5$1499497673
}
l3 = ->(x:) {
# ^^ definition local 9~#1499497673
# ^^ definition local 9$1499497673
# ^^ reference [..] Kernel#
# ^^ reference [..] Kernel#lambda().
# ^^ definition local 8~#1499497673
# ^^ definition local 8$1499497673
y += x
# ^ reference (write) local 1~#1499497673
# ^ reference local 1~#1499497673
# ^^^^^^ reference local 1~#1499497673
# ^ reference local 8~#1499497673
# ^ reference (write) local 1$1499497673
# ^ reference local 1$1499497673
# ^^^^^^ reference local 1$1499497673
# ^ reference local 8$1499497673
}
l4 = lambda { |x:|
# ^^ definition local 11~#1499497673
# ^^ definition local 11$1499497673
# ^^^^^^ reference [..] Kernel#lambda().
# ^^ definition local 10~#1499497673
# ^^ definition local 10$1499497673
y += x
# ^ reference (write) local 1~#1499497673
# ^ reference local 1~#1499497673
# ^^^^^^ reference local 1~#1499497673
# ^ reference local 10~#1499497673
# ^ reference (write) local 1$1499497673
# ^ reference local 1$1499497673
# ^^^^^^ reference local 1$1499497673
# ^ reference local 10$1499497673
}
l1.call(1)
# ^^ reference local 4~#1499497673
# ^^ reference local 4$1499497673
# ^^^^ reference [..] Proc1#call().
l2.call(2)
# ^^ reference local 6~#1499497673
# ^^ reference local 6$1499497673
# ^^^^ reference [..] Proc1#call().
l3.call(x: 3)
# ^^ reference local 9~#1499497673
# ^^ reference local 9$1499497673
# ^^^^ reference [..] Proc#call().
l4.call(x: 4)
# ^^ reference local 11~#1499497673
# ^^ reference local 11$1499497673
# ^^^^ reference [..] Proc#call().
end

def prc
# ^^^ definition [..] Object#prc().
y = 0
# ^ definition local 1~#1283111692
# ^ definition local 1$1283111692
p1 = Proc.new { |x|
# ^^ definition local 4~#1283111692
# ^^ definition local 4$1283111692
# ^^^^ reference [..] Proc#
# ^^^ reference [..] `<Class:Proc>`#new().
# ^ definition local 3~#1283111692
# ^ definition local 3$1283111692
y += x
# ^ reference (write) local 1~#1283111692
# ^ reference local 1~#1283111692
# ^^^^^^ reference local 1~#1283111692
# ^ reference local 3~#1283111692
# ^ reference (write) local 1$1283111692
# ^ reference local 1$1283111692
# ^^^^^^ reference local 1$1283111692
# ^ reference local 3$1283111692
}
p2 = proc { |x|
# ^^ definition local 6~#1283111692
# ^^ definition local 6$1283111692
# ^^^^ reference [..] Kernel#proc().
# ^ definition local 5~#1283111692
# ^ definition local 5$1283111692
y += x
# ^ reference (write) local 1~#1283111692
# ^ reference local 1~#1283111692
# ^^^^^^ reference local 1~#1283111692
# ^ reference local 5~#1283111692
# ^ reference (write) local 1$1283111692
# ^ reference local 1$1283111692
# ^^^^^^ reference local 1$1283111692
# ^ reference local 5$1283111692
}
p3 = Proc.new { |x:|
# ^^ definition local 9~#1283111692
# ^^ definition local 9$1283111692
# ^^^^ reference [..] Proc#
# ^^^ reference [..] `<Class:Proc>`#new().
# ^^ definition local 8~#1283111692
# ^^ definition local 8$1283111692
y += x
# ^ reference (write) local 1~#1283111692
# ^ reference local 1~#1283111692
# ^^^^^^ reference local 1~#1283111692
# ^ reference local 8~#1283111692
# ^ reference (write) local 1$1283111692
# ^ reference local 1$1283111692
# ^^^^^^ reference local 1$1283111692
# ^ reference local 8$1283111692
}
p4 = proc { |x:|
# ^^ definition local 11~#1283111692
# ^^ definition local 11$1283111692
# ^^^^ reference [..] Kernel#proc().
# ^^ definition local 10~#1283111692
# ^^ definition local 10$1283111692
y += x
# ^ reference (write) local 1~#1283111692
# ^ reference local 1~#1283111692
# ^^^^^^ reference local 1~#1283111692
# ^ reference local 10~#1283111692
# ^ reference (write) local 1$1283111692
# ^ reference local 1$1283111692
# ^^^^^^ reference local 1$1283111692
# ^ reference local 10$1283111692
}
p1.call(1)
# ^^ reference local 4~#1283111692
# ^^ reference local 4$1283111692
# ^^^^ reference [..] Proc#call().
p2.call(2)
# ^^ reference local 6~#1283111692
# ^^ reference local 6$1283111692
# ^^^^ reference [..] Proc1#call().
p3.call(x: 3)
# ^^ reference local 9~#1283111692
# ^^ reference local 9$1283111692
# ^^^^ reference [..] Proc#call().
p4.call(x: 4)
# ^^ reference local 11~#1283111692
# ^^ reference local 11$1283111692
# ^^^^ reference [..] Proc#call().
end

def call_block(&blk)
# ^^^^^^^^^^ definition [..] Object#call_block().
# ^^^ definition local 1~#1487178087
# ^^^ definition local 1$1487178087
blk.call
# ^^^ reference local 1~#1487178087
# ^^^ reference local 1$1487178087
end

def use_block_with_defaults
# ^^^^^^^^^^^^^^^^^^^^^^^ definition [..] Object#use_block_with_defaults().
call_block do |oops: nil|
# ^^^^^^^^^^ reference [..] Object#call_block().
# ^^^^^ definition local 1~#4118119342
# ^^^^^ definition local 1$4118119342
end

call_block do |oops = "nil"|
# ^^^^^^^^^^ reference [..] Object#call_block().
# ^^^^ definition local 2~#4118119342
# ^^^^ definition local 2$4118119342
end
end
Loading
Loading