diff --git a/pkg/analyzer/lib/src/workspace/bazel.dart b/pkg/analyzer/lib/src/workspace/bazel.dart
index bb6aaed..db269c0 100644
--- a/pkg/analyzer/lib/src/workspace/bazel.dart
+++ b/pkg/analyzer/lib/src/workspace/bazel.dart
@@ -232,7 +232,8 @@
   Source resolveAbsolute(Uri uri, [Uri actualUri]) {
     return _sourceCache.putIfAbsent(uri, () {
       if (uri.scheme == 'file') {
-        var pathRelativeToRoot = _workspace._relativeToRoot(uri.path);
+        var path = fileUriToNormalizedPath(_context, uri);
+        var pathRelativeToRoot = _workspace._relativeToRoot(path);
         if (pathRelativeToRoot == null) return null;
         var fullFilePath = _context.join(_workspace.root, pathRelativeToRoot);
         File file = _workspace.findFile(fullFilePath);
diff --git a/pkg/analyzer/test/src/workspace/bazel_test.dart b/pkg/analyzer/test/src/workspace/bazel_test.dart
index f64cfc9..9d7cd6e 100644
--- a/pkg/analyzer/test/src/workspace/bazel_test.dart
+++ b/pkg/analyzer/test/src/workspace/bazel_test.dart
@@ -134,6 +134,16 @@
         exists: true);
   }
 
+  void test_resolveAbsolute_file_bin_pathHasSpace() {
+    _addResources([
+      '/workspace/WORKSPACE',
+      '/workspace/my/foo/test',
+    ]);
+    _assertResolve('file:///workspace/bazel-bin/my/test/a .dart',
+        '/workspace/my/test/a .dart',
+        exists: false, restore: false);
+  }
+
   void test_resolveAbsolute_file_bin_to_genfiles() {
     _addResources([
       '/workspace/WORKSPACE',
diff --git a/pkg/dartdev/test/commands/language_server_test.dart b/pkg/dartdev/test/commands/language_server_test.dart
index fcc637f..1e7a46d 100644
--- a/pkg/dartdev/test/commands/language_server_test.dart
+++ b/pkg/dartdev/test/commands/language_server_test.dart
@@ -14,6 +14,9 @@
     'language-server',
     defineLanguageServerTests,
     timeout: utils.longTimeout,
+    onPlatform: {
+      'windows': Skip('https://github.com/dart-lang/sdk/issues/44679'),
+    },
   );
 }
 
diff --git a/tools/VERSION b/tools/VERSION
index 71faf2a..7ce15e2 100644
--- a/tools/VERSION
+++ b/tools/VERSION
@@ -27,5 +27,5 @@
 MAJOR 2
 MINOR 12
 PATCH 0
-PRERELEASE 237
+PRERELEASE 238
 PRERELEASE_PATCH 0
\ No newline at end of file