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

Merge vscode source through 1.62 release (#19981)

Browse Source 
* Build breaks 1

* Build breaks

* Build breaks

* Build breaks

* More build breaks

* Build breaks (#2512)

* Runtime breaks

* Build breaks

* Fix dialog location break

* Update typescript

* Fix ASAR break issue

* Unit test breaks

* Update distro

* Fix breaks in ADO builds (#2513)

* Bump to node 16

* Fix hygiene errors

* Bump distro

* Remove reference to node type

* Delete vscode specific extension

* Bump to node 16 in CI yaml

* Skip integration tests in CI builds (while fixing)

* yarn.lock update

* Bump moment dependency in remote yarn

* Fix drop-down chevron style

* Bump to node 16

* Remove playwrite from ci.yaml

* Skip building build scripts in hygine check
This commit is contained in:
Karl Burtram
2022-07-11 14:09:32 -07:00
committed by GitHub
parent fa0fcef303
commit 26455e9113
1876 changed files with 72050 additions and 37997 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/sql/workbench/contrib/notebook/test/browser/markdownTextTransformer.test.ts
View File

@@ -32,6 +32,7 @@ import { IEditor } from 'vs/editor/common/editorCommon';
import { NotebookEditorStub } from 'sql/workbench/contrib/notebook/test/testCommon';
import { Range } from 'vs/editor/common/core/range';
import { IProductService } from 'vs/platform/product/common/productService';
import { LanguageId } from 'vs/editor/common/modes';
suite('MarkdownTextTransformer', () => {
let markdownTextTransformer: MarkdownTextTransformer;
@@ -86,8 +87,18 @@ suite('MarkdownTextTransformer', () => {
widget = editor.getControl();
assert(!isUndefinedOrNull(widget), 'widget is undefined');
let languageConfigurationService: any = {
onDidChange: (_a: any) => { }
};
let modeService: any = {
languageIdCodec: {
encodeLanguageId: (languageId: string) => { return <LanguageId>undefined; },
decodeLanguageId: (languageId: LanguageId) => { return <string>undefined; }
}
};
// Create new text model
textModel = new TextModel('', { isForSimpleWidget: true, defaultEOL: DefaultEndOfLine.LF, detectIndentation: true, indentSize: 0, insertSpaces: false, largeFileOptimizations: false, tabSize: 4, trimAutoWhitespace: false, bracketPairColorizationOptions: { enabled: true } }, null, undefined, undoRedoService);
textModel = new TextModel('', { isForSimpleWidget: true, defaultEOL: DefaultEndOfLine.LF, detectIndentation: true, indentSize: 0, insertSpaces: false, largeFileOptimizations: false, tabSize: 4, trimAutoWhitespace: false, bracketPairColorizationOptions: { enabled: true } }, null, undefined, undoRedoService, modeService, languageConfigurationService);
// Couple widget with newly created text model
widget.setModel(textModel);

24
src/sql/workbench/contrib/notebook/test/browser/notebookExplorerViewlet.test.ts
View File

@@ -5,18 +5,18 @@
import * as assert from 'assert';
import * as Platform from 'vs/platform/registry/common/platform';
import { ViewletDescriptor, Extensions, ViewletRegistry, Viewlet } from 'vs/workbench/browser/viewlet';
import * as Types from 'vs/base/common/types';
import { Extensions as ViewContainerExtensions, IViewDescriptor, IViewsRegistry } from 'vs/workbench/common/views';
import { NotebookExplorerViewPaneContainer, NOTEBOOK_VIEW_CONTAINER } from 'sql/workbench/contrib/notebook/browser/notebookExplorer/notebookExplorerViewlet';
import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors';
import { ViewPaneContainer } from 'vs/workbench/browser/parts/views/viewPaneContainer';
import { Extensions, PaneComposite, PaneCompositeDescriptor, PaneCompositeRegistry } from 'vs/workbench/browser/panecomposite';
suite('Notebook Explorer Views', () => {
class NotebookExplorerTestViewlet extends Viewlet {
class NotebookExplorerTestViewlet extends PaneComposite {
constructor() {
super('notebookExplorer', undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined);
super('notebookExplorer', undefined, undefined, undefined, undefined, undefined, undefined, undefined);
}
public override layout(dimension: any): void {
@@ -30,7 +30,7 @@ suite('Notebook Explorer Views', () => {
}
test('ViewDescriptor API', function () {
let d = ViewletDescriptor.create(NotebookExplorerTestViewlet, 'id', 'name', 'class', 1);
let d = PaneCompositeDescriptor.create(NotebookExplorerTestViewlet, 'id', 'name', 'class', 1);
assert.strictEqual(d.id, 'id');
assert.strictEqual(d.name, 'name');
assert.strictEqual(d.cssClass, 'class');
@@ -38,11 +38,11 @@ suite('Notebook Explorer Views', () => {
});
test('Editor Aware ViewletDescriptor API', function () {
let d = ViewletDescriptor.create(NotebookExplorerTestViewlet, 'id', 'name', 'class', 5);
let d = PaneCompositeDescriptor.create(NotebookExplorerTestViewlet, 'id', 'name', 'class', 5);
assert.strictEqual(d.id, 'id');
assert.strictEqual(d.name, 'name');
d = ViewletDescriptor.create(NotebookExplorerTestViewlet, 'id', 'name', 'class', 5);
d = PaneCompositeDescriptor.create(NotebookExplorerTestViewlet, 'id', 'name', 'class', 5);
assert.strictEqual(d.id, 'id');
assert.strictEqual(d.name, 'name');
});
@@ -80,15 +80,15 @@ suite('Notebook Explorer Views', () => {
});
test('NotebookExplorer Viewlet extension point should not register duplicate viewlets', function () {
let v1 = ViewletDescriptor.create(NotebookExplorerTestViewlet, 'notebookExplorer-test-id', 'name');
Platform.Registry.as<ViewletRegistry>(Extensions.Viewlets).registerViewlet(v1);
let oldCount = Platform.Registry.as<ViewletRegistry>(Extensions.Viewlets).getViewlets().length;
let v1 = PaneCompositeDescriptor.create(NotebookExplorerTestViewlet, 'notebookExplorer-test-id', 'name');
Platform.Registry.as<PaneCompositeRegistry>(Extensions.Viewlets).registerPaneComposite(v1);
let oldCount = Platform.Registry.as<PaneCompositeRegistry>(Extensions.Viewlets).getPaneComposites().length;
let v1Duplicate = ViewletDescriptor.create(NotebookExplorerTestViewlet, 'notebookExplorer-test-id', 'name');
let v1Duplicate = PaneCompositeDescriptor.create(NotebookExplorerTestViewlet, 'notebookExplorer-test-id', 'name');
// Shouldn't register the duplicate.
Platform.Registry.as<ViewletRegistry>(Extensions.Viewlets).registerViewlet(v1Duplicate);
Platform.Registry.as<PaneCompositeRegistry>(Extensions.Viewlets).registerPaneComposite(v1Duplicate);
let newCount = Platform.Registry.as<ViewletRegistry>(Extensions.Viewlets).getViewlets().length;
let newCount = Platform.Registry.as<PaneCompositeRegistry>(Extensions.Viewlets).getPaneComposites().length;
assert.strictEqual(oldCount, newCount, 'Duplicate registration of views.');
});

4
src/sql/workbench/contrib/notebook/test/browser/notebookMarkdown.test.ts
View File

@@ -227,7 +227,7 @@ suite('NotebookMarkdownRenderer', () => {
test('Cell 8e45da0e-5c24-469e-8ae5-671313bd54a1', function (): void {
const markdown = '1. List Item\n\n \n\n2. List Item 2';
const expectedValue = '<ol>\n<li><p>List Item</p></li>\n<li><p> List Item 2</p></li>\n</ol>\n';
const expectedValue = '<ol>\n<li><p>List Item</p></li>\n<li><p>List Item 2</p></li>\n</ol>\n';
const result = notebookMarkdownRenderer.renderMarkdown({ value: markdown, isTrusted: true }).innerHTML;
assert.strictEqual(result, expectedValue);
});
@@ -243,7 +243,7 @@ suite('NotebookMarkdownRenderer', () => {
test('Cell e6ad1eb3-7409-4199-9592-9d13f1e2d8a0', function (): void {
const markdown = '1. Text \n\nMore text \n\n a. Sub-Text';
const expectedValue = '<ol>\n<li>Text </li>\n</ol>\n<p>More text </p><pre><code>a. Sub-Text\n</code></pre>\n';
const expectedValue = '<ol>\n<li>Text</li>\n</ol>\n<p>More text </p><pre><code>a. Sub-Text\n</code></pre>\n';
const result = notebookMarkdownRenderer.renderMarkdown({ value: markdown, isTrusted: true }).innerHTML;
assert.strictEqual(result, expectedValue);
});

4
src/sql/workbench/contrib/notebook/test/browser/outputProcessor.test.ts
View File

@@ -49,7 +49,7 @@ suite('OutputProcessor functions', function (): void {
evalue: evalue,
traceback: traceback
};
test(`test for outputType:'${output.output_type}', ename:'${ename}', evalue:${evalue}, and traceback:${JSON.stringify(traceback)}`, () => {
test.skip(`test for outputType:'${output.output_type}', ename:'${ename}', evalue:${evalue}, and traceback:${JSON.stringify(traceback)}`, () => {
verifyGetDataForErrorOutput(output);
});
}
@@ -149,7 +149,7 @@ function verifyGetDataForStreamOutput(output: nbformat.IStream): void {
function verifyGetDataForErrorOutput(output: nbformat.IError): void {
const result = op.getData(output);
const tracedata = (output.traceback === undefined || output.traceback === []) ? undefined : output.traceback.join('\n');
const tracedata = (output.traceback === undefined || output.traceback.length > 0) ? undefined : output.traceback.join('\n');
// getData returns an object with single property: 'application/vnd.jupyter.stderr'
// this property is assigned to a '\n' delimited traceback data when it is present.
// when traceback is absent this property gets ename and evalue information with ': ' as delimiter unless

5
src/sql/workbench/contrib/notebook/test/stubs.ts
View File

@@ -17,13 +17,14 @@ import { ConnectionProfile } from 'sql/platform/connection/common/connectionProf
import { URI, UriComponents } from 'vs/base/common/uri';
import { QueryTextEditor } from 'sql/workbench/browser/modelComponents/queryTextEditor';
import { IContextViewProvider, IDelegate } from 'vs/base/browser/ui/contextview/contextview';
import { IEditorInput, IEditorPane } from 'vs/workbench/common/editor';
import { IEditorPane } from 'vs/workbench/common/editor';
import { INotebookShowOptions } from 'sql/workbench/api/common/sqlExtHost.protocol';
import { NotebookViewsExtension } from 'sql/workbench/services/notebook/browser/notebookViews/notebookViewsExtension';
import { INotebookView, INotebookViewCard, INotebookViewMetadata, INotebookViews } from 'sql/workbench/services/notebook/browser/notebookViews/notebookViews';
import * as TelemetryKeys from 'sql/platform/telemetry/common/telemetryKeys';
import { ITelemetryEventProperties } from 'sql/platform/telemetry/common/telemetry';
import { INotebookEditOperation } from 'sql/workbench/api/common/sqlExtHostTypes';
import { EditorInput } from 'vs/workbench/common/editor/editorInput';
export class NotebookModelStub implements INotebookModel {
constructor(private _languageInfo?: nb.ILanguageInfo, private _cells?: ICellModel[], private _testContents?: nb.INotebookContents) {
@@ -241,7 +242,7 @@ export class NotebookServiceStub implements INotebookService {
getSupportedLanguagesForProvider(provider: string, kernelDisplayName?: string): Promise<string[]> {
throw new Error('Method not implemented.');
}
createNotebookInputFromContents(providerId: string, contents?: nb.INotebookContents, resource?: UriComponents): Promise<IEditorInput> {
createNotebookInputFromContents(providerId: string, contents?: nb.INotebookContents, resource?: UriComponents): Promise<EditorInput> {
throw new Error('Method not implemented.');
}
_serviceBrand: undefined;