Skip to content

Commit 1950fd3

Browse files
owen-mcowen-mc
committed
Ruby: Inline expectation should have space before $
1 parent 91b6801 commit 1950fd3

File tree

4 files changed

+72
-72
lines changed

4 files changed

+72
-72
lines changed

‎ruby/ql/test/library-tests/dataflow/api-graphs/callbacks.rb‎

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,39 @@
1-
Something.foo.withCallback do |a, b| #$ source=Member[Something].Method[foo].ReturnValue
2-
a.something #$ source=Member[Something].Method[foo].ReturnValue.Method[withCallback].Argument[block].Argument[0].Method[something].ReturnValue
3-
b.somethingElse #$ source=Member[Something].Method[foo].ReturnValue.Method[withCallback].Argument[block].Argument[1].Method[somethingElse].ReturnValue
4-
end #$ source=Member[Something].Method[foo].ReturnValue.Method[withCallback].ReturnValue
1+
Something.foo.withCallback do |a, b| # $ source=Member[Something].Method[foo].ReturnValue
2+
a.something # $ source=Member[Something].Method[foo].ReturnValue.Method[withCallback].Argument[block].Argument[0].Method[something].ReturnValue
3+
b.somethingElse # $ source=Member[Something].Method[foo].ReturnValue.Method[withCallback].Argument[block].Argument[1].Method[somethingElse].ReturnValue
4+
end # $ source=Member[Something].Method[foo].ReturnValue.Method[withCallback].ReturnValue
55

6-
Something.withNamedArg do |a:, b: nil| #$ source=Member[Something]
7-
a.something #$ source=Member[Something].Method[withNamedArg].Argument[block].Parameter[a:].Method[something].ReturnValue
8-
b.somethingElse #$ source=Member[Something].Method[withNamedArg].Argument[block].Parameter[b:].Method[somethingElse].ReturnValue
9-
end #$ source=Member[Something].Method[withNamedArg].ReturnValue
6+
Something.withNamedArg do |a:, b: nil| # $ source=Member[Something]
7+
a.something # $ source=Member[Something].Method[withNamedArg].Argument[block].Parameter[a:].Method[something].ReturnValue
8+
b.somethingElse # $ source=Member[Something].Method[withNamedArg].Argument[block].Parameter[b:].Method[somethingElse].ReturnValue
9+
end # $ source=Member[Something].Method[withNamedArg].ReturnValue
1010

11-
Something.withLambda ->(a, b) { #$ source=Member[Something]
12-
a.something #$ source=Member[Something].Method[withLambda].Argument[0].Parameter[0].Method[something].ReturnValue
13-
b.something #$ source=Member[Something].Method[withLambda].Argument[0].Parameter[1].Method[something].ReturnValue
14-
} #$ source=Member[Something].Method[withLambda].ReturnValue
11+
Something.withLambda ->(a, b) { # $ source=Member[Something]
12+
a.something # $ source=Member[Something].Method[withLambda].Argument[0].Parameter[0].Method[something].ReturnValue
13+
b.something # $ source=Member[Something].Method[withLambda].Argument[0].Parameter[1].Method[something].ReturnValue
14+
} # $ source=Member[Something].Method[withLambda].ReturnValue
1515

16-
Something.namedCallback( #$ source=Member[Something]
16+
Something.namedCallback( # $ source=Member[Something]
1717
onEvent: ->(a, b) {
18-
a.something #$ source=Member[Something].Method[namedCallback].Argument[onEvent:].Parameter[0].Method[something].ReturnValue
19-
b.something #$ source=Member[Something].Method[namedCallback].Argument[onEvent:].Parameter[1].Method[something].ReturnValue
18+
a.something # $ source=Member[Something].Method[namedCallback].Argument[onEvent:].Parameter[0].Method[something].ReturnValue
19+
b.something # $ source=Member[Something].Method[namedCallback].Argument[onEvent:].Parameter[1].Method[something].ReturnValue
2020
}
21-
) #$ source=Member[Something].Method[namedCallback].ReturnValue
21+
) # $ source=Member[Something].Method[namedCallback].ReturnValue
2222

23-
Something.nestedCall1 do |a| #$ source=Member[Something]
24-
a.nestedCall2 do |b:| #$ reachableFromSource=Member[Something].Method[nestedCall1].Argument[block].Parameter[0]
25-
b.something #$ source=Member[Something].Method[nestedCall1].Argument[block].Parameter[0].Method[nestedCall2].Argument[block].Parameter[b:].Method[something].ReturnValue
26-
end #$ source=Member[Something].Method[nestedCall1].Argument[block].Parameter[0].Method[nestedCall2].ReturnValue
27-
end #$ source=Member[Something].Method[nestedCall1].ReturnValue
23+
Something.nestedCall1 do |a| # $ source=Member[Something]
24+
a.nestedCall2 do |b:| # $ reachableFromSource=Member[Something].Method[nestedCall1].Argument[block].Parameter[0]
25+
b.something # $ source=Member[Something].Method[nestedCall1].Argument[block].Parameter[0].Method[nestedCall2].Argument[block].Parameter[b:].Method[something].ReturnValue
26+
end # $ source=Member[Something].Method[nestedCall1].Argument[block].Parameter[0].Method[nestedCall2].ReturnValue
27+
end # $ source=Member[Something].Method[nestedCall1].ReturnValue
2828

2929
def getCallback()
3030
->(x) {
31-
x.something #$ source=Member[Something].Method[indirectCallback].Argument[0].Parameter[0].Method[something].ReturnValue
31+
x.something # $ source=Member[Something].Method[indirectCallback].Argument[0].Parameter[0].Method[something].ReturnValue
3232
}
3333
end
34-
Something.indirectCallback(getCallback()) #$ source=Member[Something].Method[indirectCallback].ReturnValue
34+
Something.indirectCallback(getCallback()) # $ source=Member[Something].Method[indirectCallback].ReturnValue
3535

36-
Something.withMixed do |a, *args, b| #$ source=Member[Something]
37-
a.something #$ source=Member[Something].Method[withMixed].Argument[block].Parameter[0].Method[something].ReturnValue
36+
Something.withMixed do |a, *args, b| # $ source=Member[Something]
37+
a.something # $ source=Member[Something].Method[withMixed].Argument[block].Parameter[0].Method[something].ReturnValue
3838
# b.something # not currently handled correctly
39-
end #$ source=Member[Something].Method[withMixed].ReturnValue
39+
end # $ source=Member[Something].Method[withMixed].ReturnValue

‎ruby/ql/test/library-tests/dataflow/api-graphs/test1.rb‎

Lines changed: 36 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,34 @@
1-
MyModule #$ source=Member[MyModule]
2-
print MyModule.foo #$ source=Member[MyModule].Method[foo].ReturnValue
3-
Kernel.print(e) #$ source=Member[Kernel].Method[print].ReturnValue sink=Member[Kernel].Method[print].Argument[0]
4-
Object::Kernel #$ source=Member[Kernel]
5-
Object::Kernel.print(e) #$ source=Member[Kernel].Method[print].ReturnValue
1+
MyModule # $ source=Member[MyModule]
2+
print MyModule.foo # $ source=Member[MyModule].Method[foo].ReturnValue
3+
Kernel.print(e) # $ source=Member[Kernel].Method[print].ReturnValue sink=Member[Kernel].Method[print].Argument[0]
4+
Object::Kernel # $ source=Member[Kernel]
5+
Object::Kernel.print(e) # $ source=Member[Kernel].Method[print].ReturnValue
66
begin
7-
print MyModule.bar #$ source=Member[MyModule].Method[bar].ReturnValue
8-
raise AttributeError #$ source=Member[AttributeError]
9-
rescue AttributeError => e #$ source=Member[AttributeError]
10-
Kernel.print(e) #$ source=Member[Kernel].Method[print].ReturnValue
7+
print MyModule.bar # $ source=Member[MyModule].Method[bar].ReturnValue
8+
raise AttributeError # $ source=Member[AttributeError]
9+
rescue AttributeError => e # $ source=Member[AttributeError]
10+
Kernel.print(e) # $ source=Member[Kernel].Method[print].ReturnValue
1111
end
12-
Unknown.new.run #$ source=Member[Unknown].Method[new].ReturnValue.Method[run].ReturnValue
13-
Foo::Bar::Baz #$ source=Member[Foo].Member[Bar].Member[Baz]
12+
Unknown.new.run # $ source=Member[Unknown].Method[new].ReturnValue.Method[run].ReturnValue
13+
Foo::Bar::Baz # $ source=Member[Foo].Member[Bar].Member[Baz]
1414

15-
Const = [1, 2, 3] #$ source=Member[Array].MethodBracket.ReturnValue
16-
Const.each do |c| #$ source=Member[Const]
17-
puts c #$ reachableFromSource=Member[Const].Method[each].Argument[block].Parameter[0] reachableFromSource=Member[Const].Element[any]
18-
end #$ source=Member[Const].Method[each].ReturnValue sink=Member[Const].Method[each].Argument[block]
15+
Const = [1, 2, 3] # $ source=Member[Array].MethodBracket.ReturnValue
16+
Const.each do |c| # $ source=Member[Const]
17+
puts c # $ reachableFromSource=Member[Const].Method[each].Argument[block].Parameter[0] reachableFromSource=Member[Const].Element[any]
18+
end # $ source=Member[Const].Method[each].ReturnValue sink=Member[Const].Method[each].Argument[block]
1919

20-
foo = Foo #$ source=Member[Foo]
21-
foo::Bar::Baz #$ source=Member[Foo].Member[Bar].Member[Baz]
20+
foo = Foo # $ source=Member[Foo]
21+
foo::Bar::Baz # $ source=Member[Foo].Member[Bar].Member[Baz]
2222

23-
FooAlias = Foo #$ source=Member[Foo]
24-
FooAlias::Bar::Baz #$ source=Member[Foo].Member[Bar].Member[Baz] source=Member[FooAlias].Member[Bar].Member[Baz]
23+
FooAlias = Foo # $ source=Member[Foo]
24+
FooAlias::Bar::Baz # $ source=Member[Foo].Member[Bar].Member[Baz] source=Member[FooAlias].Member[Bar].Member[Baz]
2525

2626
module Outer
2727
module Inner
2828
end
2929
end
3030

31-
Outer::Inner.foo #$ source=Member[Outer].Member[Inner].Method[foo].ReturnValue
31+
Outer::Inner.foo # $ source=Member[Outer].Member[Inner].Method[foo].ReturnValue
3232

3333
module M1
3434
class C1
@@ -40,36 +40,36 @@ def m
4040
end
4141
end
4242

43-
class C2 < M1::C1 #$ source=Member[M1].Member[C1]
43+
class C2 < M1::C1 # $ source=Member[M1].Member[C1]
4444
end
4545

4646
module M2
47-
class C3 < M1::C1 #$ source=Member[M1].Member[C1]
47+
class C3 < M1::C1 # $ source=Member[M1].Member[C1]
4848
end
4949

50-
class C4 < C2 #$ source=Member[C2]
50+
class C4 < C2 # $ source=Member[C2]
5151
end
5252
end
5353

54-
C2 #$ source=Member[C2] reachableFromSource=Member[M1].Member[C1]
55-
M2::C3 #$ source=Member[M2].Member[C3] reachableFromSource=Member[M1].Member[C1]
56-
M2::C4 #$ source=Member[M2].Member[C4] reachableFromSource=Member[C2] reachableFromSource=Member[M1].Member[C1]
54+
C2 # $ source=Member[C2] reachableFromSource=Member[M1].Member[C1]
55+
M2::C3 # $ source=Member[M2].Member[C3] reachableFromSource=Member[M1].Member[C1]
56+
M2::C4 # $ source=Member[M2].Member[C4] reachableFromSource=Member[C2] reachableFromSource=Member[M1].Member[C1]
5757

58-
M1::C1.m #$ source=Member[M1].Member[C1].Method[m].ReturnValue
59-
M2::C3.m #$ source=Member[M2].Member[C3].Method[m].ReturnValue source=Member[M1].Member[C1].Method[m].ReturnValue
58+
M1::C1.m # $ source=Member[M1].Member[C1].Method[m].ReturnValue
59+
M2::C3.m # $ source=Member[M2].Member[C3].Method[m].ReturnValue source=Member[M1].Member[C1].Method[m].ReturnValue
6060

61-
M1::C1.new.m #$ source=Member[M1].Member[C1].Method[new].ReturnValue.Method[m].ReturnValue
62-
M2::C3.new.m #$ source=Member[M2].Member[C3].Method[new].ReturnValue.Method[m].ReturnValue
61+
M1::C1.new.m # $ source=Member[M1].Member[C1].Method[new].ReturnValue.Method[m].ReturnValue
62+
M2::C3.new.m # $ source=Member[M2].Member[C3].Method[new].ReturnValue.Method[m].ReturnValue
6363

64-
Foo.foo(a,b:c) #$ source=Member[Foo].Method[foo].ReturnValue sink=Member[Foo].Method[foo].Argument[0] sink=Member[Foo].Method[foo].Argument[b:]
64+
Foo.foo(a,b:c) # $ source=Member[Foo].Method[foo].ReturnValue sink=Member[Foo].Method[foo].Argument[0] sink=Member[Foo].Method[foo].Argument[b:]
6565

6666
def userDefinedFunction(x, y)
6767
x.noApiGraph(y)
68-
x.customEntryPointCall(y) #$ call=EntryPoint[CustomEntryPointCall] source=EntryPoint[CustomEntryPointCall].ReturnValue sink=EntryPoint[CustomEntryPointCall].Parameter[0]
69-
x.customEntryPointUse(y) #$ source=EntryPoint[CustomEntryPointUse]
68+
x.customEntryPointCall(y) # $ call=EntryPoint[CustomEntryPointCall] source=EntryPoint[CustomEntryPointCall].ReturnValue sink=EntryPoint[CustomEntryPointCall].Parameter[0]
69+
x.customEntryPointUse(y) # $ source=EntryPoint[CustomEntryPointUse]
7070
end
7171

72-
array = [A::B::C] #$ source=Member[Array].MethodBracket.ReturnValue
73-
array[0].m #$ source=Member[A].Member[B].Member[C].Method[m].ReturnValue source=Member[Array].MethodBracket.ReturnValue.Element[0].Method[m].ReturnValue
72+
array = [A::B::C] # $ source=Member[Array].MethodBracket.ReturnValue
73+
array[0].m # $ source=Member[A].Member[B].Member[C].Method[m].ReturnValue source=Member[Array].MethodBracket.ReturnValue.Element[0].Method[m].ReturnValue
7474

75-
A::B::C[0] #$ source=Member[A].Member[B].Member[C].Element[0]
75+
A::B::C[0] # $ source=Member[A].Member[B].Member[C].Element[0]

‎ruby/ql/test/query-tests/variables/DeadStoreOfLocal/DeadStoreOfLocal.rb‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
def test_basic(x)
2-
y = x #$ Alert
2+
y = x # $ Alert
33
y = x + 2
44
return y
55
end
@@ -27,7 +27,7 @@ def m(x)
2727
print(x + 1)
2828
end
2929
end
30-
30+
3131
class Sub < Sup
3232
def m(y)
3333
y = 3 # OK - the call to `super` sees the value of `y``
@@ -39,7 +39,7 @@ def do_twice
3939
yield
4040
yield
4141
end
42-
42+
4343
def get_done_twice x
4444
do_twice do
4545
print x
@@ -52,7 +52,7 @@ def retry_once
5252
rescue
5353
yield
5454
end
55-
55+
5656
def get_retried x
5757
retry_once do
5858
print x
@@ -63,4 +63,4 @@ def get_retried x
6363
end
6464
end
6565
end
66-
end
66+
end

‎ruby/ql/test/query-tests/variables/UninitializedLocal/UninitializedLocal.rb‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ def foo
99
m # reads local variable m
1010
else
1111
end
12-
m.strip #$ Alert
12+
m.strip # $ Alert
1313
m2 # undefined local variable or method 'm2' for main (NameError)
1414
end
1515

@@ -31,7 +31,7 @@ def test_guards
3131
b&.strip # OK - safe navigation
3232
b.strip if b # OK
3333
b.close if b && !b.closed # OK
34-
b.blowup if b || !b.blownup #$ Alert
34+
b.blowup if b || !b.blownup # $ Alert
3535

3636
if false
3737
c = "0"
@@ -64,7 +64,7 @@ def test_loop
6464
a = 0
6565
else
6666
set_a
67-
end
67+
end
6868
end until a # OK
6969
a.strip # OK - given previous until
7070
end
@@ -73,5 +73,5 @@ def test_for
7373
for i in ["foo", "bar"] # OK - since 0..10 cannot raise
7474
puts i.strip
7575
end
76-
i.strip #$ SPURIOUS: Alert
77-
end
76+
i.strip # $ SPURIOUS: Alert
77+
end

0 commit comments

Comments
 (0)