Merge branch 'master' into rebornix/notebook

This commit is contained in:
Johannes Rieken
2020-03-04 16:31:35 +01:00
65 changed files with 636 additions and 481 deletions

View File

@@ -1028,6 +1028,7 @@ class Extension<T> implements vscode.Extension<T> {
private _identifier: ExtensionIdentifier;
readonly id: string;
readonly extensionUri: URI;
readonly extensionPath: string;
readonly packageJSON: IExtensionDescription;
readonly extensionKind: vscode.ExtensionKind;
@@ -1037,6 +1038,7 @@ class Extension<T> implements vscode.Extension<T> {
this._originExtensionId = originExtensionId;
this._identifier = description.identifier;
this.id = description.identifier.value;
this.extensionUri = description.extensionLocation;
this.extensionPath = path.normalize(originalFSPath(description.extensionLocation));
this.packageJSON = description;
this.extensionKind = kind;