Skip to content

Commit bcfe56c

Browse files
committed
Test path in cross-platform friendly way
1 parent 8e0fb0b commit bcfe56c

File tree

4 files changed

+11
-6
lines changed

4 files changed

+11
-6
lines changed

pkgs/sass_language_server/lib/src/language_server.dart

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -211,8 +211,7 @@ class LanguageServer {
211211
}
212212

213213
_log.debug('Searching workspace for files');
214-
var files = await fileSystemProvider.findFiles(
215-
'**/*.{css,scss,sass}',
214+
var files = await fileSystemProvider.findFiles('**.{css,scss,sass}',
216215
root: _workspaceRoot.toFilePath(),
217216
exclude: _ls.configuration.workspace.exclude);
218217
_log.debug('Found ${files.length} files in workspace');

pkgs/sass_language_server/lib/src/local_file_system.dart

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ import 'dart:io';
22

33
import 'package:glob/glob.dart';
44
import 'package:glob/list_local_fs.dart';
5+
import 'package:path/path.dart' as p;
56
import 'package:sass_language_server/src/utils/uri.dart';
67
import 'package:sass_language_services/sass_language_services.dart';
78

@@ -22,15 +23,16 @@ class LocalFileSystem extends FileSystemProvider {
2223
var excludeGlobs = <Glob>[];
2324
if (exclude != null) {
2425
for (var pattern in exclude) {
25-
excludeGlobs.add(Glob(pattern, caseSensitive: false));
26+
excludeGlobs.add(Glob(pattern,
27+
caseSensitive: false, context: p.Context(style: p.Style.url)));
2628
}
2729
}
2830

2931
var result = <Uri>[];
3032
for (var match in list) {
3133
var excluded = false;
3234
for (var glob in excludeGlobs) {
33-
if (glob.matches(match.path)) {
35+
if (glob.matches(match.uri.path)) {
3436
excluded = true;
3537
break;
3638
}

pkgs/sass_language_server/pubspec.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ environment:
1313
dependencies:
1414
lsp_server: ^0.3.2
1515
glob: ^2.1.2
16+
path: ^1.9.0
1617
sass_language_services: ^1.0.0
1718

1819
dev_dependencies:

pkgs/sass_language_server/test/local_file_system_test.dart

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import 'package:glob/glob.dart';
2+
import 'package:path/path.dart' as p;
23
import 'package:sass_language_services/sass_language_services.dart';
34
import 'package:test/test.dart';
45

@@ -8,7 +9,8 @@ void main() {
89
var config = WorkspaceConfiguration.from(null);
910
var excludeGlobs = <Glob>[];
1011
for (var pattern in config.exclude) {
11-
excludeGlobs.add(Glob(pattern, caseSensitive: false));
12+
excludeGlobs.add(Glob(pattern,
13+
caseSensitive: false, context: p.Context(style: p.Style.url)));
1214
}
1315

1416
var nodeModulesPath =
@@ -27,7 +29,8 @@ void main() {
2729

2830
var excludeGlobs = <Glob>[];
2931
for (var pattern in config.exclude) {
30-
excludeGlobs.add(Glob(pattern, caseSensitive: false));
32+
excludeGlobs.add(Glob(pattern,
33+
caseSensitive: false, context: p.Context(style: p.Style.url)));
3134
}
3235

3336
var nodeModulesPath =

0 commit comments

Comments
 (0)