ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-02-05 01:25:38 -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

10
src/sql/workbench/browser/designer/designerIssuesTabPanelView.ts
View File

@@ -127,11 +127,11 @@ class TableFilterListRenderer implements IListRenderer<DesignerIssue, DesignerIs
}
templateData.issueIcon.className = `issue-icon ${iconClass}`;
if (element.moreInfoLink) {
const linkElement = this._instantiationService.createInstance(Link, {
label: localize('designer.moreInfoLink', "More information"),
href: element.moreInfoLink
}, undefined);
templateData.issueMoreInfoLink.appendChild(linkElement.el);
this._instantiationService.createInstance(Link, templateData.issueMoreInfoLink,
{
label: localize('designer.moreInfoLink', "More information"),
href: element.moreInfoLink
}, undefined);
} else {
DOM.clearNode(templateData.issueMoreInfoLink);
}

9
src/sql/workbench/browser/designer/designerScriptEditor.ts
View File

@@ -29,13 +29,14 @@ import { IEditorGroupsService } from 'vs/workbench/services/editor/common/editor
import { CodeEditorWidget } from 'vs/editor/browser/widget/codeEditorWidget';
import { ITextEditorOptions } from 'vs/platform/editor/common/editor';
import { onUnexpectedError } from 'vs/base/common/errors';
import { EditorInput } from 'vs/workbench/common/editor/editorInput';
class DesignerCodeEditor extends CodeEditorWidget {
}
let DesignerScriptEditorInstanceId = 0;
export class DesignerScriptEditor extends BaseTextEditor implements DesignerTextEditor {
export class DesignerScriptEditor extends BaseTextEditor<editorCommon.ICodeEditorViewState> implements DesignerTextEditor {
private _content: string;
private _contentChangeEventEmitter: Emitter<string> = new Emitter<string>();
readonly onDidContentChange: Event<string> = this._contentChangeEventEmitter.event;
@@ -81,7 +82,7 @@ export class DesignerScriptEditor extends BaseTextEditor implements DesignerText
options.folding = false;
options.renderWhitespace = 'all';
options.wordWrap = 'off';
options.renderIndentGuides = false;
options.guides = { indentation: false };
options.rulers = [];
options.glyphMargin = true;
}
@@ -119,4 +120,8 @@ export class DesignerScriptEditor extends BaseTextEditor implements DesignerText
this.layout(new DOM.Dimension(this._container.clientWidth, this._container.clientHeight));
}
}
protected tracksEditorViewState(input: EditorInput): boolean {
return input.typeId === DesignerScriptEditor.ID;
}
}