Skip to content
This repository was archived by the owner on Apr 1, 2025. It is now read-only.

Commit 6edabbb

Browse files
author
Patrick Thomson
authored
Merge branch 'master' into cleaner-implicit-params
2 parents 946c561 + c6607e4 commit 6edabbb

File tree

7 files changed

+6
-468
lines changed

7 files changed

+6
-468
lines changed

‎test/Semantic/IO/Spec.hs‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,5 @@ spec = parallel $ do
107107

108108
where blobsFromFilePath path = do
109109
h <- openFileForReading path
110-
putStrLn "got handle"
111110
blobs <- readBlobPairsFromHandle h
112-
putStrLn "got blobs"
113111
pure blobs

‎test/fixtures/cli/diff-tree.json‎

Lines changed: 1 addition & 153 deletions
Original file line numberDiff line numberDiff line change
@@ -1,153 +1 @@
1-
{
2-
"diffs": [{
3-
"diff": {
4-
"merge": {
5-
"term": "Statements",
6-
"statements": [{
7-
"merge": {
8-
"term": "Method",
9-
"methodAccessControl":"Public",
10-
"methodBody": {
11-
"merge": {
12-
"children": [{
13-
"patch": {
14-
"insert": {
15-
"term": "Send",
16-
"sourceRange": [13, 16],
17-
"sendReceiver": null,
18-
"sendBlock": null,
19-
"sendArgs": [],
20-
"sourceSpan": {
21-
"start": [2, 3],
22-
"end": [2, 6]
23-
},
24-
"sendSelector": {
25-
"patch": {
26-
"insert": {
27-
"term": "Identifier",
28-
"name": "baz",
29-
"sourceRange": [13, 16],
30-
"sourceSpan": {
31-
"start": [2, 3],
32-
"end": [2, 6]
33-
}
34-
}
35-
}
36-
}
37-
}
38-
}
39-
}],
40-
"before": {
41-
"sourceRange": [8, 11],
42-
"sourceSpan": {
43-
"start": [2, 1],
44-
"end": [2, 4]
45-
}
46-
},
47-
"after": {
48-
"sourceRange": [13, 16],
49-
"sourceSpan": {
50-
"start": [2, 3],
51-
"end": [2, 6]
52-
}
53-
}
54-
}
55-
},
56-
"methodContext": [],
57-
"methodName": {
58-
"patch": {
59-
"replace": [{
60-
"term": "Identifier",
61-
"name": "foo",
62-
"sourceRange": [4, 7],
63-
"sourceSpan": {
64-
"start": [1, 5],
65-
"end": [1, 8]
66-
}
67-
}, {
68-
"term": "Identifier",
69-
"name": "bar",
70-
"sourceRange": [4, 7],
71-
"sourceSpan": {
72-
"start": [1, 5],
73-
"end": [1, 8]
74-
}
75-
}]
76-
}
77-
},
78-
"methodParameters": [{
79-
"patch": {
80-
"insert": {
81-
"term": "Identifier",
82-
"name": "a",
83-
"sourceRange": [8, 9],
84-
"sourceSpan": {
85-
"start": [1, 9],
86-
"end": [1, 10]
87-
}
88-
}
89-
}
90-
}],
91-
"methodReceiver": {
92-
"merge": {
93-
"term": "Empty",
94-
"before": {
95-
"sourceRange": [0, 0],
96-
"sourceSpan": {
97-
"start": [1, 1],
98-
"end": [1, 1]
99-
}
100-
},
101-
"after": {
102-
"sourceRange": [0, 0],
103-
"sourceSpan": {
104-
"start": [1, 1],
105-
"end": [1, 1]
106-
}
107-
}
108-
}
109-
},
110-
"before": {
111-
"sourceRange": [0, 11],
112-
"sourceSpan": {
113-
"start": [1, 1],
114-
"end": [2, 4]
115-
}
116-
},
117-
"after": {
118-
"sourceRange": [0, 20],
119-
"sourceSpan": {
120-
"start": [1, 1],
121-
"end": [3, 4]
122-
}
123-
}
124-
}
125-
}],
126-
"before": {
127-
"sourceRange": [0, 12],
128-
"sourceSpan": {
129-
"start": [1, 1],
130-
"end": [3, 1]
131-
}
132-
},
133-
"after": {
134-
"sourceRange": [0, 21],
135-
"sourceSpan": {
136-
"start": [1, 1],
137-
"end": [4, 1]
138-
}
139-
}
140-
}
141-
},
142-
"stat": {
143-
"path": "test/fixtures/ruby/corpus/method-declaration.A.rb->test/fixtures/ruby/corpus/method-declaration.B.rb",
144-
"replace": [{
145-
"path": "test/fixtures/ruby/corpus/method-declaration.A.rb",
146-
"language": "Ruby"
147-
}, {
148-
"path": "test/fixtures/ruby/corpus/method-declaration.B.rb",
149-
"language": "Ruby"
150-
}]
151-
}
152-
}]
153-
}
1+
{"diffs":[{"diff":{"merge":{"term":"Statements","statements":[{"merge":{"term":"Method","methodAccessControl":"Public","methodBody":{"merge":{"children":[{"patch":{"insert":{"term":"Send","sourceRange":[13,16],"sendReceiver":null,"sendBlock":null,"sendArgs":[],"sourceSpan":{"start":[2,3],"end":[2,6]},"sendSelector":{"patch":{"insert":{"term":"Identifier","name":"baz","sourceRange":[13,16],"sourceSpan":{"start":[2,3],"end":[2,6]}}}}}}}],"before":{"sourceRange":[8,11],"sourceSpan":{"start":[2,1],"end":[2,4]}},"after":{"sourceRange":[13,16],"sourceSpan":{"start":[2,3],"end":[2,6]}}}},"methodContext":[],"methodName":{"patch":{"replace":[{"term":"Identifier","name":"foo","sourceRange":[4,7],"sourceSpan":{"start":[1,5],"end":[1,8]}},{"term":"Identifier","name":"bar","sourceRange":[4,7],"sourceSpan":{"start":[1,5],"end":[1,8]}}]}},"methodParameters":[{"patch":{"insert":{"term":"Identifier","name":"a","sourceRange":[8,9],"sourceSpan":{"start":[1,9],"end":[1,10]}}}}],"methodReceiver":{"merge":{"term":"Empty","before":{"sourceRange":[0,0],"sourceSpan":{"start":[1,1],"end":[1,1]}},"after":{"sourceRange":[0,0],"sourceSpan":{"start":[1,1],"end":[1,1]}}}},"before":{"sourceRange":[0,11],"sourceSpan":{"start":[1,1],"end":[2,4]}},"after":{"sourceRange":[0,20],"sourceSpan":{"start":[1,1],"end":[3,4]}}}}],"before":{"sourceRange":[0,12],"sourceSpan":{"start":[1,1],"end":[3,1]}},"after":{"sourceRange":[0,21],"sourceSpan":{"start":[1,1],"end":[4,1]}}}},"stat":{"path":"test/fixtures/ruby/corpus/method-declaration.A.rb -> test/fixtures/ruby/corpus/method-declaration.B.rb","replace":[{"path":"test/fixtures/ruby/corpus/method-declaration.A.rb","language":"Ruby"},{"path":"test/fixtures/ruby/corpus/method-declaration.B.rb","language":"Ruby"}]}}]}

‎test/fixtures/cli/diff-tree.toc.json‎

Lines changed: 1 addition & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1 @@
1-
{
2-
"files": [
3-
{
4-
"path": "test/fixtures/ruby/corpus/method-declaration.A.rb -> test/fixtures/ruby/corpus/method-declaration.B.rb",
5-
"language": "Ruby",
6-
"changes": [
7-
{
8-
"category": "Method",
9-
"term": "bar",
10-
"span":
11-
{
12-
"start":
13-
{
14-
"line": 1,
15-
"column": 1
16-
},
17-
"end":
18-
{
19-
"line": 3,
20-
"column": 4
21-
}
22-
},
23-
"changeType": "MODIFIED"
24-
}]
25-
}]
26-
}
1+
{"files":[{"path":"test/fixtures/ruby/corpus/method-declaration.A.rb -> test/fixtures/ruby/corpus/method-declaration.B.rb","language":"Ruby","changes":[{"category":"Method","term":"bar","span":{"start":{"line":1,"column":1},"end":{"line":3,"column":4}},"changeType":"MODIFIED"}]}]}

‎test/fixtures/cli/parse-tree-empty.json‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1 @@
1-
{
2-
"trees": []
3-
}
1+
{"trees":[]}

‎test/fixtures/cli/parse-tree.json‎

Lines changed: 1 addition & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -1,62 +1 @@
1-
{
2-
"trees": [{
3-
"tree": {
4-
"term": "Statements",
5-
"statements": [{
6-
"term": "LowPrecedenceAnd",
7-
"lhs": {
8-
"term": "Send",
9-
"sendArgs": [],
10-
"sendBlock": null,
11-
"sendReceiver": null,
12-
"sendSelector": {
13-
"term": "Identifier",
14-
"name": "foo",
15-
"sourceRange": [0, 3],
16-
"sourceSpan": {
17-
"start": [1, 1],
18-
"end": [1, 4]
19-
}
20-
},
21-
"sourceRange": [0, 3],
22-
"sourceSpan": {
23-
"start": [1, 1],
24-
"end": [1, 4]
25-
}
26-
},
27-
"rhs": {
28-
"term": "Send",
29-
"sendArgs": [],
30-
"sendBlock": null,
31-
"sendReceiver": null,
32-
"sendSelector": {
33-
"term": "Identifier",
34-
"name": "bar",
35-
"sourceRange": [8, 11],
36-
"sourceSpan": {
37-
"start": [1, 9],
38-
"end": [1, 12]
39-
}
40-
},
41-
"sourceRange": [8, 11],
42-
"sourceSpan": {
43-
"start": [1, 9],
44-
"end": [1, 12]
45-
}
46-
},
47-
"sourceRange": [0, 11],
48-
"sourceSpan": {
49-
"start": [1, 1],
50-
"end": [1, 12]
51-
}
52-
}],
53-
"sourceRange": [0, 12],
54-
"sourceSpan": {
55-
"start": [1, 1],
56-
"end": [2, 1]
57-
}
58-
},
59-
"path": "test/fixtures/ruby/corpus/and-or.A.rb",
60-
"language": "Ruby"
61-
}]
62-
}
1+
{"trees":[{"tree":{"term":"Statements","statements":[{"term":"LowPrecedenceAnd","lhs":{"term":"Send","sendArgs":[],"sendBlock":null,"sendReceiver":null,"sendSelector":{"term":"Identifier","name":"foo","sourceRange":[0,3],"sourceSpan":{"start":[1,1],"end":[1,4]}},"sourceRange":[0,3],"sourceSpan":{"start":[1,1],"end":[1,4]}},"rhs":{"term":"Send","sendArgs":[],"sendBlock":null,"sendReceiver":null,"sendSelector":{"term":"Identifier","name":"bar","sourceRange":[8,11],"sourceSpan":{"start":[1,9],"end":[1,12]}},"sourceRange":[8,11],"sourceSpan":{"start":[1,9],"end":[1,12]}},"sourceRange":[0,11],"sourceSpan":{"start":[1,1],"end":[1,12]}}],"sourceRange":[0,12],"sourceSpan":{"start":[1,1],"end":[2,1]}},"path":"test/fixtures/ruby/corpus/and-or.A.rb","language":"Ruby"}]}

‎test/fixtures/cli/parse-tree.symbols.json‎

Lines changed: 1 addition & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1 @@
1-
{
2-
"files": [
3-
{
4-
"path": "test/fixtures/ruby/corpus/method-declaration.A.rb",
5-
"language": "Ruby",
6-
"symbols": [
7-
{
8-
"symbol": "foo",
9-
"kind": "Method",
10-
"line": "def foo",
11-
"span":
12-
{
13-
"start":
14-
{
15-
"line": 1,
16-
"column": 1
17-
},
18-
"end":
19-
{
20-
"line": 2,
21-
"column": 4
22-
}
23-
}
24-
}]
25-
}]
26-
}
1+
{"files":[{"path":"test/fixtures/ruby/corpus/method-declaration.A.rb","language":"Ruby","symbols":[{"symbol":"foo","kind":"Method","line":"def foo","span":{"start":{"line":1,"column":1},"end":{"line":2,"column":4}}}]}]}

0 commit comments

Comments
 (0)