Skip to content

Commit

Permalink
Bug fixes
Browse files Browse the repository at this point in the history
- Make sure settings exist before trying to use them
- Properly export extensions
  • Loading branch information
golf1052 committed May 10, 2020
1 parent 9bc34be commit e7001cb
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 4 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "code-sync",
"displayName": "CodeSync",
"description": "Sync VSCode extensions using your favorite file synchronization service (OneDrive, Dropbox, Google Drive, etc.)",
"version": "2.7.0",
"version": "2.7.1",
"publisher": "golf1052",
"keywords": [
"sync",
Expand Down
2 changes: 1 addition & 1 deletion src/cs.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ export const KEYBINDINGS = 'keybindings.json';
export const SNIPPETS = 'snippets';
export const LOCAL_SETTINGS = 'local-settings.json';

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

Expand Down
3 changes: 2 additions & 1 deletion src/extension.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,15 @@ var codeSync: cs.CodeSync;
export async function activate(context: vscode.ExtensionContext) {
logger = new Logger('extension');
codeSync = new cs.CodeSync(cs.vsCodeExtensionDir, cs.codeSyncExtensionDir, '');
// we need to check for settings to ensure they exist because we start using them right away
await codeSync.checkForSettings();
helpers.isCodeASnapPackage(codeSync.Settings.Settings, true);
codeSync.CanManageExtensions = helpers.isCodeOnPath(codeSync.Settings.Settings);
if (!codeSync.CanManageExtensions) {
await vscode.window.showWarningMessage(helpers.getCodePathWarningMessage());
}
codeSync.Active = true;
if (codeSync.Active) {
await codeSync.checkForSettings();
codeSync.startFileWatcher();
if (codeSync.Settings.Settings.autoImport) {
codeSync.importSettings();
Expand Down
6 changes: 5 additions & 1 deletion src/helpers.ts
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,11 @@ export function isInsiders(): boolean {

export function getInstalledExtensions(): vscode.Extension<any>[] {
return vscode.extensions.all.filter(e => {
return e.extensionPath.startsWith(os.homedir());
if (windows) {
return !e.extensionPath.includes('app\\extensions');
} else {
return !e.extensionPath.includes('app/extension');
}
});
}

Expand Down

0 comments on commit e7001cb

Please sign in to comment.