fix(windows): closes #260

Author: Mayank1791989

flow-libs/vscode-uri.js.flow

@@ -0,0 +1,5 @@
+/* @flow */
+declare module 'vscode-uri' {
+  import typeof { Uri } from 'vscode';
+  declare export var URI: Uri;
+}

flow-typed/npm/vscode-uri_vx.x.x.js

@@ -0,0 +1,45 @@
+// flow-typed signature: 51a66a87f4c53bcd85ae2390149f70b0
+// flow-typed version: <<STUB>>/vscode-uri_v2.0.3/flow_v0.106.3
+
+/**
+ * This is an autogenerated libdef stub for:
+ *
+ *   'vscode-uri'
+ *
+ * Fill this stub out by replacing all the `any` types.
+ *
+ * Once filled out, we encourage you to share your work with the
+ * community by sending a pull request to:
+ * https://github.com/flowtype/flow-typed
+ */
+
+declare module 'vscode-uri' {
+  declare module.exports: any;
+}
+
+/**
+ * We include stubs for each file inside this npm package in case you need to
+ * require those files directly. Feel free to delete any files that aren't
+ * needed.
+ */
+declare module 'vscode-uri/lib/esm' {
+  declare module.exports: any;
+}
+
+declare module 'vscode-uri/lib/umd' {
+  declare module.exports: any;
+}
+
+// Filename aliases
+declare module 'vscode-uri/lib/esm/index' {
+  declare module.exports: $Exports<'vscode-uri/lib/esm'>;
+}
+declare module 'vscode-uri/lib/esm/index.js' {
+  declare module.exports: $Exports<'vscode-uri/lib/esm'>;
+}
+declare module 'vscode-uri/lib/umd/index' {
+  declare module.exports: $Exports<'vscode-uri/lib/umd'>;
+}
+declare module 'vscode-uri/lib/umd/index.js' {
+  declare module.exports: $Exports<'vscode-uri/lib/umd'>;
+}

lib/flowLSP/FlowLanguageClient/FlowLanguageClient.js

@@ -11,6 +11,7 @@ import * as UUID from 'vscode-languageclient/lib/utils/uuid';
 import getFlowPath from '../utils/getFlowPath';
 import getFlowVersion from '../utils/getFlowVersion';
 import assertFlowSupportsLSP from '../utils/assertFlowSupportsLSP';
+import uriToString from '../utils/uriToString';
 
 import Logger, { type LogLevel } from '../utils/Logger';
 
@@ -184,7 +185,7 @@ export default class FlowLanguageClient {
       middleware: createMiddleware(flowconfigPath, flowVersion),
 
       uriConverters: {
-        code2Protocol: (uri) => uri.toString(true), // this disables URL-encoding for file URLs
+        code2Protocol: uriToString,
         protocol2Code: (value) => vscode.Uri.parse(value),
       },
 

lib/flowLSP/utils/__tests__/uriToString.test.js

@@ -0,0 +1,22 @@
+/* @flow */
+import { URI } from 'vscode-uri';
+import uriToString from '../uriToString';
+
+jest.mock('../isWindows', () => {
+  return () => true;
+});
+
+test('[windows] lower-case drive letter', () => {
+  const uri = URI.file('c:/flow/test');
+  expect(uriToString(uri)).toEqual('file:///C:/flow/test');
+});
+
+test('[windows] upper-case drive letter', () => {
+  const uri = URI.file('C:/flow/test');
+  expect(uriToString(uri)).toEqual('file:///C:/flow/test');
+});
+
+test('linux path', () => {
+  const uri = URI.file('/flow/test');
+  expect(uriToString(uri)).toEqual('file:///flow/test');
+});

lib/flowLSP/utils/isWindows.js

@@ -0,0 +1,4 @@
+/* @flow */
+export default function isWindows(): boolean {
+  return process.platform === 'win32';
+}

lib/flowLSP/utils/uriToString.js

@@ -0,0 +1,74 @@
+/* @flow */
+import { type Uri } from 'vscode';
+import isWindows from './isWindows';
+
+const CharCode = {
+  Colon: 58,
+  Slash: 47,
+  A: 65,
+  Z: 90,
+  a: 97,
+  z: 122,
+};
+
+export default function uriToString(uri: Uri): string {
+  return isWindows() ? uriToStringWindows(uri) : uri.toString(true);
+}
+
+// NOTE: default `uri.toString` converts windows drive letters to lower-case
+// which causes issues with flow so below patching toString to return upper-case drive letters
+// see issue https://github.com/flowtype/flow-for-vscode/issues/260
+function uriToStringWindows(uri: Uri): string {
+  const uriString = uri.toString(true);
+  const windowsDriveLetter = getWindowsDriveLetter(uri);
+  return windowsDriveLetter
+    ? makeWindowsDriveLetterUppercase(uriString, windowsDriveLetter)
+    : uriString;
+}
+
+function isAlphabet(charCode: number): boolean {
+  return (
+    (charCode >= CharCode.A && charCode <= CharCode.Z) ||
+    (charCode >= CharCode.a && charCode <= CharCode.z)
+  );
+}
+
+function getWindowsDriveLetter(uri: Uri): ?string {
+  const { path } = uri;
+
+  let driveLetter: ?string = null;
+  // path of type '/c:/'
+  if (
+    path.length >= 3 &&
+    path.charCodeAt(0) === CharCode.Slash &&
+    path.charCodeAt(2) === CharCode.Colon
+  ) {
+    const code = path.charCodeAt(1);
+    if (
+      (code >= CharCode.A && code <= CharCode.Z) ||
+      (code >= CharCode.a && code <= CharCode.z)
+    ) {
+      driveLetter = path.charAt(1);
+    }
+    // path of type 'c:/'
+  } else if (path.length >= 2 && path.charCodeAt(1) === CharCode.Colon) {
+    const code = path.charCodeAt(0);
+    if (isAlphabet(code)) {
+      driveLetter = path.charAt(0);
+    }
+  }
+
+  return driveLetter;
+}
+
+function makeWindowsDriveLetterUppercase(
+  uriString: string,
+  windowsDriveLetter: string,
+): string {
+  const lowerCaseDriveLetter = windowsDriveLetter.toLowerCase();
+  const upperCaseDriveLetter = windowsDriveLetter.toUpperCase();
+  return uriString.replace(
+    `${lowerCaseDriveLetter}:`,
+    `${upperCaseDriveLetter}:`,
+  );
+}

package.json

@@ -246,7 +246,8 @@
     "rollup-plugin-commonjs": "10.0.2",
     "rollup-plugin-node-resolve": "5.2.0",
     "rollup-plugin-progress": "1.1.1",
-    "rollup-plugin-terser": "5.1.1"
+    "rollup-plugin-terser": "5.1.1",
+    "vscode-uri": "2.0.3"
   },
   "icon": "flow-logo.png",
   "repository": {

yarn.lock

@@ -4826,6 +4826,11 @@ vscode-languageserver-types@3.14.0:
   version "3.14.0"
   resolved "https://registry.yarnpkg.com/vscode-languageserver-types/-/vscode-languageserver-types-3.14.0.tgz#d3b5952246d30e5241592b6dde8280e03942e743"
 
+vscode-uri@2.0.3:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/vscode-uri/-/vscode-uri-2.0.3.tgz#25e5f37f552fbee3cec7e5f80cef8469cefc6543"
+  integrity sha512-4D3DI3F4uRy09WNtDGD93H9q034OHImxiIcSq664Hq1Y1AScehlP3qqZyTkX/RWxeu0MRMHGkrxYqm2qlDF/aw==
+
 w3c-hr-time@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/w3c-hr-time/-/w3c-hr-time-1.0.1.tgz#82ac2bff63d950ea9e3189a58a65625fedf19045"