Skip to content

Commit 315213e

Browse files
committed
Refactor to match test style
1 parent 3a00206 commit 315213e

File tree

2 files changed

+17
-31
lines changed

2 files changed

+17
-31
lines changed

pkgs/sass_language_services/test/features/document_symbols/docyment_symbol_ranges_test.dart

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import 'package:sass_language_services/sass_language_services.dart';
22
import 'package:test/test.dart';
33

44
import '../../memory_file_system.dart';
5-
import '../../position_matchers.dart';
5+
import '../../range_matchers.dart';
66
import '../../test_client_capabilities.dart';
77

88
final fs = MemoryFileSystem();
@@ -28,32 +28,32 @@ void main() {
2828
var result = ls.findDocumentSymbols(document);
2929
var fooNameRange = result.first.selectionRange;
3030
var fooSymbolRange = result.first.range;
31-
expect(fooNameRange.start, AtLine(0));
32-
expect(fooNameRange.start, AtCharacter(0));
31+
expect(fooNameRange, StartsAtLine(0));
32+
expect(fooNameRange, StartsAtCharacter(0));
3333

34-
expect(fooNameRange.end, AtLine(0));
35-
expect(fooNameRange.end, AtCharacter(4));
34+
expect(fooNameRange, EndsAtLine(0));
35+
expect(fooNameRange, EndsAtCharacter(4));
3636

37-
expect(fooSymbolRange.start, AtLine(0));
38-
expect(fooSymbolRange.start, AtCharacter(0));
37+
expect(fooSymbolRange, StartsAtLine(0));
38+
expect(fooSymbolRange, StartsAtCharacter(0));
3939

40-
expect(fooSymbolRange.end, AtLine(2));
41-
expect(fooSymbolRange.end, AtCharacter(1));
40+
expect(fooSymbolRange, EndsAtLine(2));
41+
expect(fooSymbolRange, EndsAtCharacter(1));
4242

4343
var barNameRange = result.last.selectionRange;
4444
var barSymbolRange = result.last.range;
4545

46-
expect(barNameRange.start, AtLine(4));
47-
expect(barNameRange.start, AtCharacter(0));
46+
expect(barNameRange, StartsAtLine(4));
47+
expect(barNameRange, StartsAtCharacter(0));
4848

49-
expect(barNameRange.end, AtLine(4));
50-
expect(barNameRange.end, AtCharacter(4));
49+
expect(barNameRange, EndsAtLine(4));
50+
expect(barNameRange, EndsAtCharacter(4));
5151

52-
expect(barSymbolRange.start, AtLine(4));
53-
expect(barSymbolRange.start, AtCharacter(0));
52+
expect(barSymbolRange, StartsAtLine(4));
53+
expect(barSymbolRange, StartsAtCharacter(0));
5454

55-
expect(barSymbolRange.end, AtLine(6));
56-
expect(barSymbolRange.end, AtCharacter(1));
55+
expect(barSymbolRange, EndsAtLine(6));
56+
expect(barSymbolRange, EndsAtCharacter(1));
5757
});
5858

5959
test('Sass indented selector ranges are correct', () {

pkgs/sass_language_services/test/position_matchers.dart renamed to pkgs/sass_language_services/test/range_matchers.dart

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,6 @@
11
import 'package:lsp_server/lsp_server.dart';
22
import 'package:test/test.dart';
33

4-
class AtLine extends CustomMatcher {
5-
AtLine(Object? valueOrMatcher)
6-
: super('Position at line', 'line', valueOrMatcher);
7-
8-
featureValueOf(actual) => (actual as Position).line;
9-
}
10-
11-
class AtCharacter extends CustomMatcher {
12-
AtCharacter(Object? valueOrMatcher)
13-
: super('Position at character', 'character', valueOrMatcher);
14-
15-
featureValueOf(actual) => (actual as Position).character;
16-
}
17-
184
class StartsAtLine extends CustomMatcher {
195
StartsAtLine(Object? valueOrMatcher)
206
: super('Range starts at line', 'line', valueOrMatcher);

0 commit comments

Comments
 (0)