Skip to content

Commit ebdca4f

Browse files
authored
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
1 parent f30d800 commit ebdca4f

File tree

6 files changed

+18
-13
lines changed

6 files changed

+18
-13
lines changed

CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22

33
[![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)
44

5+
#### v3.3.1 - June 25,2019
6+
* Small Improvements
57

68
#### v3.3.0 - June 25,2019
79

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "code-settings-sync",
33
"displayName": "Settings Sync",
44
"description": "Synchronize Settings, Snippets, Themes, File Icons, Launch, Keybindings, Workspaces and Extensions Across Multiple Machines Using GitHub Gist.",
5-
"version": "3.3.0",
5+
"version": "3.3.1",
66
"icon": "images/cloud.png",
77
"publisher": "Shan",
88
"author": {

package.nls.pt.json renamed to package.nls.pt-br.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,4 +103,4 @@
103103
"common.prompt.enterGithubAccessToken": "Você também adicionar manualmente um token (Pasta de Usuário / syncLocalSettings.json). Pressione [Enter] ou a tecla [Esc] para cancelar.",
104104
"common.prompt.restartCode": "Você deseja recarregar para aplicar extensões e configurações?,",
105105
"common.button.yes": "Sim"
106-
}
106+
}

src/commons.ts

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -166,9 +166,9 @@ export default class Commons {
166166

167167
Object.assign(customSettings, tempObj);
168168
customSettings.token = customSettings.token.trim();
169-
return customSettings;
170169
}
171170
} catch (e) {
171+
customSettings = null;
172172
Commons.LogException(
173173
e,
174174
"Sync : Unable to read " +
@@ -182,9 +182,8 @@ export default class Commons {
182182
"http://shanalikhan.github.io/2017/02/19/Option-to-ignore-settings-folders-code-settings-sync.html"
183183
)
184184
);
185-
customSettings = null;
186-
return customSettings;
187185
}
186+
return customSettings;
188187
}
189188

190189
public async SetCustomSettings(setting: CustomConfig): Promise<boolean> {

src/environmentPath.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ export function osTypeFromString(osName: string): OsType {
1616
}
1717

1818
export class Environment {
19-
public static CURRENT_VERSION: number = 330;
19+
public static CURRENT_VERSION: number = 331;
2020
public static getVersion(): string {
2121
return (
2222
Environment.CURRENT_VERSION.toString().slice(0, 1) +

src/sync.ts

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -621,13 +621,17 @@ export class Sync {
621621
file.gistName === state.environment.FILE_KEYBINDING_MAC ||
622622
file.gistName === state.environment.FILE_KEYBINDING_DEFAULT
623623
) {
624-
const localContent = await FileService.ReadFile(filePath);
625-
content = PragmaUtil.processBeforeWrite(
626-
localContent,
627-
content,
628-
state.environment.OsType,
629-
localSettings.customConfig.hostName
630-
);
624+
const fileExists = await FileService.FileExists(filePath);
625+
626+
if (fileExists) {
627+
const localContent = await FileService.ReadFile(filePath);
628+
content = PragmaUtil.processBeforeWrite(
629+
localContent,
630+
content,
631+
state.environment.OsType,
632+
localSettings.customConfig.hostName
633+
);
634+
}
631635
}
632636

633637
actionList.push(

0 commit comments

Comments
 (0)