Skip to content

Commit c16e83c

Browse files
abeaumontabeaumont
authored
Merge pull request #26 from abeaumont/feature/add-sdk-versioning
Add SDK versioning support
2 parents 8521d78 + 34f88e5 commit c16e83c

File tree

16 files changed

+8839
-11
lines changed

16 files changed

+8839
-11
lines changed

‎.travis.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ services:
77
- docker
88

99
before_script:
10-
- go get -v github.com/bblfsh/sdk/...
10+
- go get -v gopkg.in/bblfsh/sdk.v0/...
1111
- bblfsh-sdk prepare-build .
1212
- go get -v -t ./...
1313

‎driver/main.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package main
22

33
import (
4-
"github.com/bblfsh/sdk/protocol/driver"
4+
"gopkg.in/bblfsh/sdk.v0/protocol/driver"
55

66
"github.com/bblfsh/bash-driver/driver/normalizer"
77
)

‎driver/normalizer/annotation.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
package normalizer
22

33
import (
4-
. "github.com/bblfsh/sdk/uast"
5-
. "github.com/bblfsh/sdk/uast/ann"
6-
74
"github.com/bblfsh/bash-driver/driver/normalizer/intellij"
5+
6+
. "gopkg.in/bblfsh/sdk.v0/uast"
7+
. "gopkg.in/bblfsh/sdk.v0/uast/ann"
88
"gopkg.in/src-d/go-errors.v0"
99
)
1010

‎driver/normalizer/annotation_test.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@ import (
88
"sort"
99
"testing"
1010

11-
"github.com/bblfsh/sdk/protocol/native"
12-
"github.com/bblfsh/sdk/uast"
13-
"github.com/bblfsh/sdk/uast/ann"
1411
"github.com/stretchr/testify/require"
12+
"gopkg.in/bblfsh/sdk.v0/protocol/native"
13+
"gopkg.in/bblfsh/sdk.v0/uast"
14+
"gopkg.in/bblfsh/sdk.v0/uast/ann"
1515
)
1616

1717
// the directories with the fixtures for the integration and the unit

‎driver/normalizer/intellij/intellij.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
// on constants defined in that library.
44
package intellij
55

6-
import . "github.com/bblfsh/sdk/uast/ann"
6+
import . "gopkg.in/bblfsh/sdk.v0/uast/ann"
77

88
var (
99
File = HasInternalType("FILE")

‎driver/normalizer/parser.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package normalizer
22

33
import (
4-
"github.com/bblfsh/sdk/protocol/driver"
5-
"github.com/bblfsh/sdk/protocol/native"
4+
"gopkg.in/bblfsh/sdk.v0/protocol/driver"
5+
"gopkg.in/bblfsh/sdk.v0/protocol/native"
66
)
77

88
var ToNoder = &native.ObjectToNoder{

‎tests/comments.uast‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ b="foo bar" # comment 2
3232
. . . }
3333
. . }
3434
. . 1: [Bash] linefeed {
35+
. . . Roles: Unannotated
3536
. . . TOKEN "
3637
"
3738
. . . StartPosition: {
@@ -45,6 +46,7 @@ b="foo bar" # comment 2
4546
. . . }
4647
. . }
4748
. . 2: [Bash] linefeed {
49+
. . . Roles: Unannotated
4850
. . . TOKEN "
4951
"
5052
. . . StartPosition: {
@@ -58,6 +60,7 @@ b="foo bar" # comment 2
5860
. . . }
5961
. . }
6062
. . 3: simple-command {
63+
. . . Roles: Unannotated
6164
. . . TOKEN "a="# not a comment""
6265
. . . StartPosition: {
6366
. . . . Offset: 13
@@ -70,6 +73,7 @@ b="foo bar" # comment 2
7073
. . . }
7174
. . . Children: {
7275
. . . . 0: var-def-element {
76+
. . . . . Roles: Unannotated
7377
. . . . . TOKEN "a="# not a comment""
7478
. . . . . StartPosition: {
7579
. . . . . . Offset: 13
@@ -95,6 +99,7 @@ b="foo bar" # comment 2
9599
. . . . . . . }
96100
. . . . . . }
97101
. . . . . . 1: [Bash] = {
102+
. . . . . . . Roles: Unannotated
98103
. . . . . . . TOKEN "="
99104
. . . . . . . StartPosition: {
100105
. . . . . . . . Offset: 14
@@ -107,6 +112,7 @@ b="foo bar" # comment 2
107112
. . . . . . . }
108113
. . . . . . }
109114
. . . . . . 2: [Bash] string {
115+
. . . . . . . Roles: Unannotated
110116
. . . . . . . TOKEN ""# not a comment""
111117
. . . . . . . StartPosition: {
112118
. . . . . . . . Offset: 15
@@ -119,6 +125,7 @@ b="foo bar" # comment 2
119125
. . . . . . . }
120126
. . . . . . . Children: {
121127
. . . . . . . . 0: [Bash] string begin {
128+
. . . . . . . . . Roles: Unannotated
122129
. . . . . . . . . TOKEN """
123130
. . . . . . . . . StartPosition: {
124131
. . . . . . . . . . Offset: 15
@@ -131,6 +138,7 @@ b="foo bar" # comment 2
131138
. . . . . . . . . }
132139
. . . . . . . . }
133140
. . . . . . . . 1: [Bash] string content {
141+
. . . . . . . . . Roles: Unannotated
134142
. . . . . . . . . TOKEN "# not a comment"
135143
. . . . . . . . . StartPosition: {
136144
. . . . . . . . . . Offset: 16
@@ -143,6 +151,7 @@ b="foo bar" # comment 2
143151
. . . . . . . . . }
144152
. . . . . . . . }
145153
. . . . . . . . 2: [Bash] string end {
154+
. . . . . . . . . Roles: Unannotated
146155
. . . . . . . . . TOKEN """
147156
. . . . . . . . . StartPosition: {
148157
. . . . . . . . . . Offset: 31
@@ -161,6 +170,7 @@ b="foo bar" # comment 2
161170
. . . }
162171
. . }
163172
. . 4: [Bash] linefeed {
173+
. . . Roles: Unannotated
164174
. . . TOKEN "
165175
"
166176
. . . StartPosition: {
@@ -174,6 +184,7 @@ b="foo bar" # comment 2
174184
. . . }
175185
. . }
176186
. . 5: [Bash] linefeed {
187+
. . . Roles: Unannotated
177188
. . . TOKEN "
178189
"
179190
. . . StartPosition: {
@@ -187,6 +198,7 @@ b="foo bar" # comment 2
187198
. . . }
188199
. . }
189200
. . 6: simple-command {
201+
. . . Roles: Unannotated
190202
. . . TOKEN "b="foo bar""
191203
. . . StartPosition: {
192204
. . . . Offset: 34
@@ -199,6 +211,7 @@ b="foo bar" # comment 2
199211
. . . }
200212
. . . Children: {
201213
. . . . 0: var-def-element {
214+
. . . . . Roles: Unannotated
202215
. . . . . TOKEN "b="foo bar""
203216
. . . . . StartPosition: {
204217
. . . . . . Offset: 34
@@ -224,6 +237,7 @@ b="foo bar" # comment 2
224237
. . . . . . . }
225238
. . . . . . }
226239
. . . . . . 1: [Bash] = {
240+
. . . . . . . Roles: Unannotated
227241
. . . . . . . TOKEN "="
228242
. . . . . . . StartPosition: {
229243
. . . . . . . . Offset: 35
@@ -236,6 +250,7 @@ b="foo bar" # comment 2
236250
. . . . . . . }
237251
. . . . . . }
238252
. . . . . . 2: [Bash] string {
253+
. . . . . . . Roles: Unannotated
239254
. . . . . . . TOKEN ""foo bar""
240255
. . . . . . . StartPosition: {
241256
. . . . . . . . Offset: 36
@@ -248,6 +263,7 @@ b="foo bar" # comment 2
248263
. . . . . . . }
249264
. . . . . . . Children: {
250265
. . . . . . . . 0: [Bash] string begin {
266+
. . . . . . . . . Roles: Unannotated
251267
. . . . . . . . . TOKEN """
252268
. . . . . . . . . StartPosition: {
253269
. . . . . . . . . . Offset: 36
@@ -260,6 +276,7 @@ b="foo bar" # comment 2
260276
. . . . . . . . . }
261277
. . . . . . . . }
262278
. . . . . . . . 1: [Bash] string content {
279+
. . . . . . . . . Roles: Unannotated
263280
. . . . . . . . . TOKEN "foo bar"
264281
. . . . . . . . . StartPosition: {
265282
. . . . . . . . . . Offset: 37
@@ -272,6 +289,7 @@ b="foo bar" # comment 2
272289
. . . . . . . . . }
273290
. . . . . . . . }
274291
. . . . . . . . 2: [Bash] string end {
292+
. . . . . . . . . Roles: Unannotated
275293
. . . . . . . . . TOKEN """
276294
. . . . . . . . . StartPosition: {
277295
. . . . . . . . . . Offset: 44
@@ -290,6 +308,7 @@ b="foo bar" # comment 2
290308
. . . }
291309
. . }
292310
. . 7: WHITE_SPACE {
311+
. . . Roles: Unannotated
293312
. . . TOKEN " "
294313
. . . StartPosition: {
295314
. . . . Offset: 45
@@ -315,6 +334,7 @@ b="foo bar" # comment 2
315334
. . . }
316335
. . }
317336
. . 9: [Bash] linefeed {
337+
. . . Roles: Unannotated
318338
. . . TOKEN "
319339
"
320340
. . . StartPosition: {

0 commit comments

Comments
 (0)