V3.3.1 (#924)

* Rename package.nls.pt.json to package.nls.pt-br.json This aligns the filename to the one needed by VSCode. * Fix issues on first install * #922 * #922 * #922
shanalikhan · Jun 25, 2019 · ebdca4f · ebdca4f
1 parent f30d800
commit ebdca4f
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 13 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 [![Version](https://vsmarketplacebadge.apphb.com/version/Shan.code-settings-sync.svg)](https://marketplace.visualstudio.com/items?itemName=Shan.code-settings-sync) [![Travis](https://img.shields.io/travis/rust-lang/rust.svg)](https://marketplace.visualstudio.com/items?itemName=Shan.code-settings-sync) [![Master course](https://img.shields.io/badge/Supported%20by-VSCode%20Power%20User%20Course%20%E2%86%92-gray.svg?colorA=444444&colorB=4F44D6)](https://t.co/8BEMyhpKU5?amp=1)
 
+#### v3.3.1 - June 25,2019
+* Small Improvements
 
 #### v3.3.0 - June 25,2019
 

diff --git a/package.json b/package.json
@@ -2,7 +2,7 @@
   "name": "code-settings-sync",
   "displayName": "Settings Sync",
   "description": "Synchronize Settings, Snippets, Themes, File Icons, Launch, Keybindings, Workspaces and Extensions Across Multiple Machines Using GitHub Gist.",
-  "version": "3.3.0",
+  "version": "3.3.1",
   "icon": "images/cloud.png",
   "publisher": "Shan",
   "author": {

diff --git a/package.nls.pt.json → package.nls.pt-br.json b/package.nls.pt.json → package.nls.pt-br.json
@@ -103,4 +103,4 @@
   "common.prompt.enterGithubAccessToken": "Você também adicionar manualmente um token (Pasta de Usuário / syncLocalSettings.json). Pressione [Enter] ou a tecla [Esc] para cancelar.",
   "common.prompt.restartCode": "Você deseja recarregar para aplicar extensões e configurações?,",
   "common.button.yes": "Sim"
-}
+}
diff --git a/src/commons.ts b/src/commons.ts
@@ -166,9 +166,9 @@ export default class Commons {
 
         Object.assign(customSettings, tempObj);
         customSettings.token = customSettings.token.trim();
-        return customSettings;
       }
     } catch (e) {
+      customSettings = null;
       Commons.LogException(
         e,
         "Sync : Unable to read " +
@@ -182,9 +182,8 @@ export default class Commons {
           "http://shanalikhan.github.io/2017/02/19/Option-to-ignore-settings-folders-code-settings-sync.html"
         )
       );
-      customSettings = null;
-      return customSettings;
     }
+    return customSettings;
   }
 
   public async SetCustomSettings(setting: CustomConfig): Promise<boolean> {

diff --git a/src/environmentPath.ts b/src/environmentPath.ts
@@ -16,7 +16,7 @@ export function osTypeFromString(osName: string): OsType {
 }
 
 export class Environment {
-  public static CURRENT_VERSION: number = 330;
+  public static CURRENT_VERSION: number = 331;
   public static getVersion(): string {
     return (
       Environment.CURRENT_VERSION.toString().slice(0, 1) +

diff --git a/src/sync.ts b/src/sync.ts
@@ -621,13 +621,17 @@ export class Sync {
                 file.gistName === state.environment.FILE_KEYBINDING_MAC ||
                 file.gistName === state.environment.FILE_KEYBINDING_DEFAULT
               ) {
-                const localContent = await FileService.ReadFile(filePath);
-                content = PragmaUtil.processBeforeWrite(
-                  localContent,
-                  content,
-                  state.environment.OsType,
-                  localSettings.customConfig.hostName
-                );
+                const fileExists = await FileService.FileExists(filePath);
+
+                if (fileExists) {
+                  const localContent = await FileService.ReadFile(filePath);
+                  content = PragmaUtil.processBeforeWrite(
+                    localContent,
+                    content,
+                    state.environment.OsType,
+                    localSettings.customConfig.hostName
+                  );
+                }
               }
 
               actionList.push(