Skip to content

Commit

Permalink
Workaround for multiple publishers installed (#1067)
Browse files Browse the repository at this point in the history
  • Loading branch information
ejizba authored Jun 19, 2019
1 parent e1ab431 commit 3fa76ec
Show file tree
Hide file tree
Showing 4 changed files with 210 additions and 48 deletions.
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
## 0.6.4 - 19 June 2019

### Fixed
* Mitigate error "command 'vscode-docker.images.selectGroupBy' already exists" [#1008](https://github.com/microsoft/vscode-docker/issues/1008)

## 0.6.3 - 18 June 2019

### Changed
Expand Down
9 changes: 9 additions & 0 deletions extension.ts
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,15 @@ export async function activateInternal(ctx: vscode.ExtensionContext, perfStats:
this.properties.isActivationEvent = 'true';
this.measurements.mainFileLoad = (perfStats.loadEndTime - perfStats.loadStartTime) / 1000;

const extension = vscode.extensions.getExtension('PeterJausovec.vscode-docker');
if (extension) {
// temporary workaround for https://github.com/microsoft/vscode-docker/issues/1008
// We will essentially defer all functionality to the old publisher's extension if we detect both installed
vscode.commands.executeCommand('setContext', 'isOldDockerPublisherInstalled', true);
this.properties.isOldDockerPublisherInstalled = 'true';
return;
}

ctx.subscriptions.push(
vscode.languages.registerCompletionItemProvider(
DOCUMENT_SELECTOR,
Expand Down
2 changes: 1 addition & 1 deletion package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 3fa76ec

Please sign in to comment.