ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-02-06 01:25:38 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge from vscode ad407028575a77ea387eb7cc219b323dc017b686

Browse Source
This commit is contained in:
ADS Merger
2020-08-22 06:06:52 +00:00
committed by Anthony Dresser
parent 404260b8a0
commit 4ad73d381c
480 changed files with 14360 additions and 14122 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
extensions/notebook/src/book/bookTreeItem.ts
View File

@@ -62,6 +62,13 @@ export class BookTreeItem extends vscode.TreeItem {
this.setCommand();
}
this.iconPath = icons;
if (this.book.type === BookTreeItemType.ExternalLink) {
this.tooltip = `${this._uri}`;
}
else {
this.tooltip = this.book.type === BookTreeItemType.Book ? this.book.root : this.book.contentPath;
}
}
private setPageVariables() {
@@ -151,14 +158,7 @@ export class BookTreeItem extends vscode.TreeItem {
return this._nextUri;
}
get tooltip(): string {
if (this.book.type === BookTreeItemType.ExternalLink) {
return `${this._uri}`;
}
else {
return this.book.type === BookTreeItemType.Book ? this.book.root : this.book.contentPath;
}
}
public readonly tooltip: string;
/**
* Helper method to find a child section with a specified URL

2
extensions/notebook/src/integrationTest/index.ts
View File

@@ -38,7 +38,7 @@ if (process.env.BUILD_ARTIFACTSTAGINGDIRECTORY) {
reporterEnabled: 'spec, mocha-junit-reporter',
mochaJunitReporterReporterOptions: {
testsuitesTitle: `${suite} ${process.platform}`,
mochaFile: path.join(process.env.BUILD_ARTIFACTSTAGINGDIRECTORY, `test-results/${process.platform}-${suite.toLowerCase().replace(/[^\w]/g, '-')}-results.xml`)
mochaFile: path.join(process.env.BUILD_ARTIFACTSTAGINGDIRECTORY, `test-results/${process.platform}-${process.arch}-${suite.toLowerCase().replace(/[^\w]/g, '-')}-results.xml`)
}
};
}

3
extensions/notebook/src/test/common/stubs.ts
View File

@@ -23,6 +23,9 @@ export class MockExtensionContext implements vscode.ExtensionContext {
constructor() {
this.subscriptions = [];
}
storageUri: vscode.Uri;
globalStorageUri: vscode.Uri;
logUri: vscode.Uri;
environmentVariableCollection: vscode.EnvironmentVariableCollection;
}