Skip to content

Commit 3091243

Browse files
thecrypticacethecrypticace
committed
Collect offset-based range information
1 parent 08a200d commit 3091243

File tree

14 files changed

+244
-53
lines changed

14 files changed

+244
-53
lines changed

‎packages/tailwindcss-language-server/tests/code-actions/conflict.json

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,8 @@
1414
"range": {
1515
"start": { "line": 0, "character": 12 },
1616
"end": { "line": 0, "character": 31 }
17-
}
17+
},
18+
"span": [12, 31]
1819
},
1920
"relativeRange": {
2021
"start": { "line": 0, "character": 0 },
@@ -23,7 +24,8 @@
2324
"range": {
2425
"start": { "line": 0, "character": 12 },
2526
"end": { "line": 0, "character": 21 }
26-
}
27+
},
28+
"span": [12, 21]
2729
},
2830
"otherClassNames": [
2931
{
@@ -33,7 +35,8 @@
3335
"range": {
3436
"start": { "line": 0, "character": 12 },
3537
"end": { "line": 0, "character": 31 }
36-
}
38+
},
39+
"span": [12, 31]
3740
},
3841
"relativeRange": {
3942
"start": { "line": 0, "character": 10 },
@@ -42,7 +45,8 @@
4245
"range": {
4346
"start": { "line": 0, "character": 22 },
4447
"end": { "line": 0, "character": 31 }
45-
}
48+
},
49+
"span": [22, 31]
4650
}
4751
],
4852
"range": {
@@ -92,7 +96,8 @@
9296
"range": {
9397
"start": { "line": 0, "character": 12 },
9498
"end": { "line": 0, "character": 31 }
95-
}
99+
},
100+
"span": [12, 31]
96101
},
97102
"relativeRange": {
98103
"start": { "line": 0, "character": 10 },
@@ -101,7 +106,8 @@
101106
"range": {
102107
"start": { "line": 0, "character": 22 },
103108
"end": { "line": 0, "character": 31 }
104-
}
109+
},
110+
"span": [22, 31]
105111
},
106112
"otherClassNames": [
107113
{
@@ -111,7 +117,8 @@
111117
"range": {
112118
"start": { "line": 0, "character": 12 },
113119
"end": { "line": 0, "character": 31 }
114-
}
120+
},
121+
"span": [12, 31]
115122
},
116123
"relativeRange": {
117124
"start": { "line": 0, "character": 0 },
@@ -120,7 +127,8 @@
120127
"range": {
121128
"start": { "line": 0, "character": 12 },
122129
"end": { "line": 0, "character": 21 }
123-
}
130+
},
131+
"span": [12, 21]
124132
}
125133
],
126134
"range": {

‎packages/tailwindcss-language-server/tests/diagnostics/css-conflict/css.json

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,15 @@
1212
"start": { "line": 0, "character": 15 },
1313
"end": { "line": 0, "character": 34 }
1414
},
15+
"span": [15, 34],
1516
"important": false
1617
},
1718
"relativeRange": {
1819
"start": { "line": 0, "character": 0 },
1920
"end": { "line": 0, "character": 9 }
2021
},
21-
"range": { "start": { "line": 0, "character": 15 }, "end": { "line": 0, "character": 24 } }
22+
"range": { "start": { "line": 0, "character": 15 }, "end": { "line": 0, "character": 24 } },
23+
"span": [15, 24]
2224
},
2325
"otherClassNames": [
2426
{
@@ -29,6 +31,7 @@
2931
"start": { "line": 0, "character": 15 },
3032
"end": { "line": 0, "character": 34 }
3133
},
34+
"span": [15, 34],
3235
"important": false
3336
},
3437
"relativeRange": {
@@ -38,7 +41,8 @@
3841
"range": {
3942
"start": { "line": 0, "character": 25 },
4043
"end": { "line": 0, "character": 34 }
41-
}
44+
},
45+
"span": [25, 34]
4246
}
4347
],
4448
"range": { "start": { "line": 0, "character": 15 }, "end": { "line": 0, "character": 24 } },
@@ -67,13 +71,15 @@
6771
"start": { "line": 0, "character": 15 },
6872
"end": { "line": 0, "character": 34 }
6973
},
74+
"span": [15, 34],
7075
"important": false
7176
},
7277
"relativeRange": {
7378
"start": { "line": 0, "character": 10 },
7479
"end": { "line": 0, "character": 19 }
7580
},
76-
"range": { "start": { "line": 0, "character": 25 }, "end": { "line": 0, "character": 34 } }
81+
"range": { "start": { "line": 0, "character": 25 }, "end": { "line": 0, "character": 34 } },
82+
"span": [25, 34]
7783
},
7884
"otherClassNames": [
7985
{
@@ -84,6 +90,7 @@
8490
"start": { "line": 0, "character": 15 },
8591
"end": { "line": 0, "character": 34 }
8692
},
93+
"span": [15, 34],
8794
"important": false
8895
},
8996
"relativeRange": {
@@ -93,7 +100,8 @@
93100
"range": {
94101
"start": { "line": 0, "character": 15 },
95102
"end": { "line": 0, "character": 24 }
96-
}
103+
},
104+
"span": [15, 24]
97105
}
98106
],
99107
"range": { "start": { "line": 0, "character": 25 }, "end": { "line": 0, "character": 34 } },

‎packages/tailwindcss-language-server/tests/diagnostics/css-conflict/jsx-concat-positive.json

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,15 @@
1111
"range": {
1212
"start": { "line": 0, "character": 17 },
1313
"end": { "line": 0, "character": 36 }
14-
}
14+
},
15+
"span": [17, 36]
1516
},
1617
"relativeRange": {
1718
"start": { "line": 0, "character": 0 },
1819
"end": { "line": 0, "character": 9 }
1920
},
20-
"range": { "start": { "line": 0, "character": 17 }, "end": { "line": 0, "character": 26 } }
21+
"range": { "start": { "line": 0, "character": 17 }, "end": { "line": 0, "character": 26 } },
22+
"span": [17, 26]
2123
},
2224
"otherClassNames": [
2325
{
@@ -27,7 +29,8 @@
2729
"range": {
2830
"start": { "line": 0, "character": 17 },
2931
"end": { "line": 0, "character": 36 }
30-
}
32+
},
33+
"span": [17, 36]
3134
},
3235
"relativeRange": {
3336
"start": { "line": 0, "character": 10 },
@@ -36,7 +39,8 @@
3639
"range": {
3740
"start": { "line": 0, "character": 27 },
3841
"end": { "line": 0, "character": 36 }
39-
}
42+
},
43+
"span": [27, 36]
4044
}
4145
],
4246
"range": { "start": { "line": 0, "character": 17 }, "end": { "line": 0, "character": 26 } },
@@ -64,13 +68,15 @@
6468
"range": {
6569
"start": { "line": 0, "character": 17 },
6670
"end": { "line": 0, "character": 36 }
67-
}
71+
},
72+
"span": [17, 36]
6873
},
6974
"relativeRange": {
7075
"start": { "line": 0, "character": 10 },
7176
"end": { "line": 0, "character": 19 }
7277
},
73-
"range": { "start": { "line": 0, "character": 27 }, "end": { "line": 0, "character": 36 } }
78+
"range": { "start": { "line": 0, "character": 27 }, "end": { "line": 0, "character": 36 } },
79+
"span": [27, 36]
7480
},
7581
"otherClassNames": [
7682
{
@@ -80,7 +86,8 @@
8086
"range": {
8187
"start": { "line": 0, "character": 17 },
8288
"end": { "line": 0, "character": 36 }
83-
}
89+
},
90+
"span": [17, 36]
8491
},
8592
"relativeRange": {
8693
"start": { "line": 0, "character": 0 },
@@ -89,7 +96,8 @@
8996
"range": {
9097
"start": { "line": 0, "character": 17 },
9198
"end": { "line": 0, "character": 26 }
92-
}
99+
},
100+
"span": [17, 26]
93101
}
94102
],
95103
"range": { "start": { "line": 0, "character": 27 }, "end": { "line": 0, "character": 36 } },

‎packages/tailwindcss-language-server/tests/diagnostics/css-conflict/simple.json

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,15 @@
1010
"range": {
1111
"start": { "line": 0, "character": 12 },
1212
"end": { "line": 0, "character": 31 }
13-
}
13+
},
14+
"span": [12, 31]
1415
},
1516
"relativeRange": {
1617
"start": { "line": 0, "character": 0 },
1718
"end": { "line": 0, "character": 9 }
1819
},
19-
"range": { "start": { "line": 0, "character": 12 }, "end": { "line": 0, "character": 21 } }
20+
"range": { "start": { "line": 0, "character": 12 }, "end": { "line": 0, "character": 21 } },
21+
"span": [12, 21]
2022
},
2123
"otherClassNames": [
2224
{
@@ -26,7 +28,8 @@
2628
"range": {
2729
"start": { "line": 0, "character": 12 },
2830
"end": { "line": 0, "character": 31 }
29-
}
31+
},
32+
"span": [12, 31]
3033
},
3134
"relativeRange": {
3235
"start": { "line": 0, "character": 10 },
@@ -35,7 +38,8 @@
3538
"range": {
3639
"start": { "line": 0, "character": 22 },
3740
"end": { "line": 0, "character": 31 }
38-
}
41+
},
42+
"span": [22, 31]
3943
}
4044
],
4145
"range": { "start": { "line": 0, "character": 12 }, "end": { "line": 0, "character": 21 } },
@@ -63,13 +67,15 @@
6367
"range": {
6468
"start": { "line": 0, "character": 12 },
6569
"end": { "line": 0, "character": 31 }
66-
}
70+
},
71+
"span": [12, 31]
6772
},
6873
"relativeRange": {
6974
"start": { "line": 0, "character": 10 },
7075
"end": { "line": 0, "character": 19 }
7176
},
72-
"range": { "start": { "line": 0, "character": 22 }, "end": { "line": 0, "character": 31 } }
77+
"range": { "start": { "line": 0, "character": 22 }, "end": { "line": 0, "character": 31 } },
78+
"span": [22, 31]
7379
},
7480
"otherClassNames": [
7581
{
@@ -79,7 +85,8 @@
7985
"range": {
8086
"start": { "line": 0, "character": 12 },
8187
"end": { "line": 0, "character": 31 }
82-
}
88+
},
89+
"span": [12, 31]
8390
},
8491
"relativeRange": {
8592
"start": { "line": 0, "character": 0 },
@@ -88,7 +95,8 @@
8895
"range": {
8996
"start": { "line": 0, "character": 12 },
9097
"end": { "line": 0, "character": 21 }
91-
}
98+
},
99+
"span": [12, 21]
92100
}
93101
],
94102
"range": { "start": { "line": 0, "character": 22 }, "end": { "line": 0, "character": 31 } },

‎packages/tailwindcss-language-server/tests/diagnostics/css-conflict/variants-positive.json

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,15 @@
1010
"range": {
1111
"start": { "line": 0, "character": 12 },
1212
"end": { "line": 0, "character": 37 }
13-
}
13+
},
14+
"span": [12, 37]
1415
},
1516
"relativeRange": {
1617
"start": { "line": 0, "character": 0 },
1718
"end": { "line": 0, "character": 12 }
1819
},
19-
"range": { "start": { "line": 0, "character": 12 }, "end": { "line": 0, "character": 24 } }
20+
"range": { "start": { "line": 0, "character": 12 }, "end": { "line": 0, "character": 24 } },
21+
"span": [12, 24]
2022
},
2123
"otherClassNames": [
2224
{
@@ -26,7 +28,8 @@
2628
"range": {
2729
"start": { "line": 0, "character": 12 },
2830
"end": { "line": 0, "character": 37 }
29-
}
31+
},
32+
"span": [12, 37]
3033
},
3134
"relativeRange": {
3235
"start": { "line": 0, "character": 13 },
@@ -35,7 +38,8 @@
3538
"range": {
3639
"start": { "line": 0, "character": 25 },
3740
"end": { "line": 0, "character": 37 }
38-
}
41+
},
42+
"span": [25, 37]
3943
}
4044
],
4145
"range": { "start": { "line": 0, "character": 12 }, "end": { "line": 0, "character": 24 } },
@@ -63,13 +67,15 @@
6367
"range": {
6468
"start": { "line": 0, "character": 12 },
6569
"end": { "line": 0, "character": 37 }
66-
}
70+
},
71+
"span": [12, 37]
6772
},
6873
"relativeRange": {
6974
"start": { "line": 0, "character": 13 },
7075
"end": { "line": 0, "character": 25 }
7176
},
72-
"range": { "start": { "line": 0, "character": 25 }, "end": { "line": 0, "character": 37 } }
77+
"range": { "start": { "line": 0, "character": 25 }, "end": { "line": 0, "character": 37 } },
78+
"span": [25, 37]
7379
},
7480
"otherClassNames": [
7581
{
@@ -79,7 +85,8 @@
7985
"range": {
8086
"start": { "line": 0, "character": 12 },
8187
"end": { "line": 0, "character": 37 }
82-
}
88+
},
89+
"span": [12, 37]
8390
},
8491
"relativeRange": {
8592
"start": { "line": 0, "character": 0 },
@@ -88,7 +95,8 @@
8895
"range": {
8996
"start": { "line": 0, "character": 12 },
9097
"end": { "line": 0, "character": 24 }
91-
}
98+
},
99+
"span": [12, 24]
92100
}
93101
],
94102
"range": { "start": { "line": 0, "character": 25 }, "end": { "line": 0, "character": 37 } },

0 commit comments

Comments
 (0)