Skip to content

Commit e7001cb

Browse files
committed
Bug fixes
- Make sure settings exist before trying to use them - Properly export extensions
1 parent 9bc34be commit e7001cb

File tree

4 files changed

+9
-4
lines changed

4 files changed

+9
-4
lines changed

package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "code-sync",
33
"displayName": "CodeSync",
44
"description": "Sync VSCode extensions using your favorite file synchronization service (OneDrive, Dropbox, Google Drive, etc.)",
5-
"version": "2.7.0",
5+
"version": "2.7.1",
66
"publisher": "golf1052",
77
"keywords": [
88
"sync",

src/cs.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ export const KEYBINDINGS = 'keybindings.json';
1818
export const SNIPPETS = 'snippets';
1919
export const LOCAL_SETTINGS = 'local-settings.json';
2020

21-
export const currentVersion: string = '2.7.0';
21+
export const currentVersion: string = '2.7.1';
2222
export let vsCodeExtensionDir: string = helpers.getExtensionDir();
2323
export let codeSyncExtensionDir: string = path.join(vsCodeExtensionDir, 'golf1052.code-sync-' + currentVersion);
2424

src/extension.ts

+2-1
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,15 @@ var codeSync: cs.CodeSync;
1010
export async function activate(context: vscode.ExtensionContext) {
1111
logger = new Logger('extension');
1212
codeSync = new cs.CodeSync(cs.vsCodeExtensionDir, cs.codeSyncExtensionDir, '');
13+
// we need to check for settings to ensure they exist because we start using them right away
14+
await codeSync.checkForSettings();
1315
helpers.isCodeASnapPackage(codeSync.Settings.Settings, true);
1416
codeSync.CanManageExtensions = helpers.isCodeOnPath(codeSync.Settings.Settings);
1517
if (!codeSync.CanManageExtensions) {
1618
await vscode.window.showWarningMessage(helpers.getCodePathWarningMessage());
1719
}
1820
codeSync.Active = true;
1921
if (codeSync.Active) {
20-
await codeSync.checkForSettings();
2122
codeSync.startFileWatcher();
2223
if (codeSync.Settings.Settings.autoImport) {
2324
codeSync.importSettings();

src/helpers.ts

+5-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,11 @@ export function isInsiders(): boolean {
3030

3131
export function getInstalledExtensions(): vscode.Extension<any>[] {
3232
return vscode.extensions.all.filter(e => {
33-
return e.extensionPath.startsWith(os.homedir());
33+
if (windows) {
34+
return !e.extensionPath.includes('app\\extensions');
35+
} else {
36+
return !e.extensionPath.includes('app/extension');
37+
}
3438
});
3539
}
3640

0 commit comments

Comments
 (0)