Add support for Windows

Author: ggabarrin

src/persistence/serialization/deserializer.ts

@@ -4,14 +4,18 @@ import * as vscode from 'vscode';
 import { CommentReaction, CommentThread, Range } from 'vscode';
 import { NoteComment } from '../../models/noteComment';
 import { commentController } from '../../controllers/comments';
-import { relativePathtoFull } from '../../utils';
+import { isWindows, pathToWin32, relativePathToFull } from '../../utils';
 import { Resource } from '../../reactions/resource';
 
 export class Deserializer {
   static deserializeReaction(reaction: any): CommentReaction {
+    let iconPath = relativePathToFull(reaction.iconPath, Resource.extensionPath);
+    if (isWindows()) {
+      iconPath = pathToWin32(iconPath);
+    }
     return {
       count: reaction.count,
-      iconPath: relativePathtoFull(reaction.iconPath, Resource.extensionPath),
+      iconPath: iconPath,
       label: reaction.label,
       authorHasReacted: false,
     };
@@ -42,8 +46,12 @@ export class Deserializer {
   }
 
   static deserializeThread(thread: any): CommentThread {
+    let uri = relativePathToFull(thread.uri);
+    if (isWindows()) {
+      uri = pathToWin32(uri);
+    }
     const newThread = commentController.createCommentThread(
-      vscode.Uri.file(relativePathtoFull(thread.uri)),
+      vscode.Uri.file(uri),
       this.deserializeRange(thread.range),
       [],
     );

src/persistence/serialization/serializer.ts

@@ -1,19 +1,23 @@
 'use strict';
 
 import { Comment, CommentReaction, CommentThread, Range } from 'vscode';
-import { fullPathtoRelative } from '../../utils';
+import { fullPathToRelative, isWindows, pathToPosix, pathToWin32 } from '../../utils';
 import { Resource } from '../../reactions/resource';
 
 export class Serializer {
   static serializeReaction(reaction: CommentReaction) {
+    let iconPath = fullPathToRelative(
+      typeof reaction.iconPath === 'string'
+        ? reaction.iconPath
+        : reaction.iconPath.fsPath,
+      Resource.extensionPath,
+    );
+    if (isWindows()) {
+      iconPath = pathToPosix(iconPath);
+    }
     return {
       count: reaction.count,
-      iconPath: fullPathtoRelative(
-        typeof reaction.iconPath === 'string'
-          ? reaction.iconPath
-          : reaction.iconPath.fsPath,
-        Resource.extensionPath,
-      ),
+      iconPath: iconPath,
       label: reaction.label,
     };
   }
@@ -45,9 +49,13 @@ export class Serializer {
     thread.comments.forEach((comment) => {
       serializedComments.push(this.serializeComment(comment));
     });
+    let uri = fullPathToRelative(thread.uri.path);
+    if (isWindows()) {
+      uri = pathToPosix(uri);
+    }
     return {
       range: this.serializeRange(thread.range),
-      uri: fullPathtoRelative(thread.uri.path),
+      uri: uri,
       comments: serializedComments,
       id: thread.contextValue,
     };

src/utils/index.ts

@@ -2,6 +2,11 @@
 
 import * as vscode from 'vscode';
 import * as path from 'path';
+import { platform } from 'os';
+
+export const isWindows = () => {
+  return platform() === 'win32';
+};
 
 export const pathToPosix = (aPath: string) => {
   return aPath.split(path.sep).join(path.posix.sep);
@@ -19,14 +24,14 @@ export const getWorkspacePath = () => {
   }
 };
 
-export const relativePathtoFull = (aPath: string, basePath?: string) => {
+export const relativePathToFull = (aPath: string, basePath?: string) => {
   if (basePath) {
     return path.join(basePath, aPath);
   }
   return path.join(getWorkspacePath(), aPath);
 };
 
-export const fullPathtoRelative = (aPath: string, basePath?: string) => {
+export const fullPathToRelative = (aPath: string, basePath?: string) => {
   if (basePath) {
     return path.relative(basePath, aPath);
   }