ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-02-16 10:58:30 -05:00
Code Issues Packages Projects Releases Wiki Activity

Vscode merge (#4582)

Browse Source 
* Merge from vscode 37cb23d3dd4f9433d56d4ba5ea3203580719a0bd

* fix issues with merges

* bump node version in azpipe

* replace license headers

* remove duplicate launch task

* fix build errors

* fix build errors

* fix tslint issues

* working through package and linux build issues

* more work

* wip

* fix packaged builds

* working through linux build errors

* wip

* wip

* wip

* fix mac and linux file limits

* iterate linux pipeline

* disable editor typing

* revert series to parallel

* remove optimize vscode from linux

* fix linting issues

* revert testing change

* add work round for new node

* readd packaging for extensions

* fix issue with angular not resolving decorator dependencies
This commit is contained in:
Anthony Dresser
2019-03-19 17:44:35 -07:00
committed by GitHub
parent 833d197412
commit 87765e8673
1879 changed files with 54505 additions and 38058 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/vs/editor/test/common/config/commonEditorConfig.test.ts
View File

@@ -3,11 +3,11 @@
* Licensed under the Source EULA. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/
import * as assert from 'assert';
import { AccessibilitySupport } from 'vs/base/common/platform';
import { IEnvConfiguration } from 'vs/editor/common/config/commonEditorConfig';
import { IEditorHoverOptions } from 'vs/editor/common/config/editorOptions';
import { EditorZoom } from 'vs/editor/common/config/editorZoom';
import { TestConfiguration } from 'vs/editor/test/common/mocks/testConfiguration';
import { AccessibilitySupport } from 'vs/platform/accessibility/common/accessibility';
suite('Common Editor Config', () => {
test('Zoom Level', () => {

56
src/vs/editor/test/common/controller/cursorMoveHelper.test.ts
View File

@@ -7,36 +7,36 @@ import { CursorColumns } from 'vs/editor/common/controller/cursorCommon';
suite('CursorMove', () => {
test('nextTabStop', () => {
assert.equal(CursorColumns.nextTabStop(0, 4), 4);
assert.equal(CursorColumns.nextTabStop(1, 4), 4);
assert.equal(CursorColumns.nextTabStop(2, 4), 4);
assert.equal(CursorColumns.nextTabStop(3, 4), 4);
assert.equal(CursorColumns.nextTabStop(4, 4), 8);
assert.equal(CursorColumns.nextTabStop(5, 4), 8);
assert.equal(CursorColumns.nextTabStop(6, 4), 8);
assert.equal(CursorColumns.nextTabStop(7, 4), 8);
assert.equal(CursorColumns.nextTabStop(8, 4), 12);
test('nextRenderTabStop', () => {
assert.equal(CursorColumns.nextRenderTabStop(0, 4), 4);
assert.equal(CursorColumns.nextRenderTabStop(1, 4), 4);
assert.equal(CursorColumns.nextRenderTabStop(2, 4), 4);
assert.equal(CursorColumns.nextRenderTabStop(3, 4), 4);
assert.equal(CursorColumns.nextRenderTabStop(4, 4), 8);
assert.equal(CursorColumns.nextRenderTabStop(5, 4), 8);
assert.equal(CursorColumns.nextRenderTabStop(6, 4), 8);
assert.equal(CursorColumns.nextRenderTabStop(7, 4), 8);
assert.equal(CursorColumns.nextRenderTabStop(8, 4), 12);
assert.equal(CursorColumns.nextTabStop(0, 2), 2);
assert.equal(CursorColumns.nextTabStop(1, 2), 2);
assert.equal(CursorColumns.nextTabStop(2, 2), 4);
assert.equal(CursorColumns.nextTabStop(3, 2), 4);
assert.equal(CursorColumns.nextTabStop(4, 2), 6);
assert.equal(CursorColumns.nextTabStop(5, 2), 6);
assert.equal(CursorColumns.nextTabStop(6, 2), 8);
assert.equal(CursorColumns.nextTabStop(7, 2), 8);
assert.equal(CursorColumns.nextTabStop(8, 2), 10);
assert.equal(CursorColumns.nextRenderTabStop(0, 2), 2);
assert.equal(CursorColumns.nextRenderTabStop(1, 2), 2);
assert.equal(CursorColumns.nextRenderTabStop(2, 2), 4);
assert.equal(CursorColumns.nextRenderTabStop(3, 2), 4);
assert.equal(CursorColumns.nextRenderTabStop(4, 2), 6);
assert.equal(CursorColumns.nextRenderTabStop(5, 2), 6);
assert.equal(CursorColumns.nextRenderTabStop(6, 2), 8);
assert.equal(CursorColumns.nextRenderTabStop(7, 2), 8);
assert.equal(CursorColumns.nextRenderTabStop(8, 2), 10);
assert.equal(CursorColumns.nextTabStop(0, 1), 1);
assert.equal(CursorColumns.nextTabStop(1, 1), 2);
assert.equal(CursorColumns.nextTabStop(2, 1), 3);
assert.equal(CursorColumns.nextTabStop(3, 1), 4);
assert.equal(CursorColumns.nextTabStop(4, 1), 5);
assert.equal(CursorColumns.nextTabStop(5, 1), 6);
assert.equal(CursorColumns.nextTabStop(6, 1), 7);
assert.equal(CursorColumns.nextTabStop(7, 1), 8);
assert.equal(CursorColumns.nextTabStop(8, 1), 9);
assert.equal(CursorColumns.nextRenderTabStop(0, 1), 1);
assert.equal(CursorColumns.nextRenderTabStop(1, 1), 2);
assert.equal(CursorColumns.nextRenderTabStop(2, 1), 3);
assert.equal(CursorColumns.nextRenderTabStop(3, 1), 4);
assert.equal(CursorColumns.nextRenderTabStop(4, 1), 5);
assert.equal(CursorColumns.nextRenderTabStop(5, 1), 6);
assert.equal(CursorColumns.nextRenderTabStop(6, 1), 7);
assert.equal(CursorColumns.nextRenderTabStop(7, 1), 8);
assert.equal(CursorColumns.nextRenderTabStop(8, 1), 9);
});
test('visibleColumnFromColumn', () => {

2
src/vs/editor/test/common/editorTestUtils.ts
View File

@@ -16,6 +16,7 @@ export function withEditorModel(text: string[], callback: (model: TextModel) =>
export interface IRelaxedTextModelCreationOptions {
tabSize?: number;
indentSize?: number;
insertSpaces?: boolean;
detectIndentation?: boolean;
trimAutoWhitespace?: boolean;
@@ -27,6 +28,7 @@ export interface IRelaxedTextModelCreationOptions {
export function createTextModel(text: string, _options: IRelaxedTextModelCreationOptions = TextModel.DEFAULT_CREATION_OPTIONS, languageIdentifier: LanguageIdentifier | null = null, uri: URI | null = null): TextModel {
const options: ITextModelCreationOptions = {
tabSize: (typeof _options.tabSize === 'undefined' ? TextModel.DEFAULT_CREATION_OPTIONS.tabSize : _options.tabSize),
indentSize: (typeof _options.indentSize === 'undefined' ? TextModel.DEFAULT_CREATION_OPTIONS.indentSize : _options.indentSize),
insertSpaces: (typeof _options.insertSpaces === 'undefined' ? TextModel.DEFAULT_CREATION_OPTIONS.insertSpaces : _options.insertSpaces),
detectIndentation: (typeof _options.detectIndentation === 'undefined' ? TextModel.DEFAULT_CREATION_OPTIONS.detectIndentation : _options.detectIndentation),
trimAutoWhitespace: (typeof _options.trimAutoWhitespace === 'undefined' ? TextModel.DEFAULT_CREATION_OPTIONS.trimAutoWhitespace : _options.trimAutoWhitespace),

2
src/vs/editor/test/common/mocks/mockMode.ts
View File

@@ -9,7 +9,7 @@ import { IMode, LanguageIdentifier } from 'vs/editor/common/modes';
import { ILanguageSelection } from 'vs/editor/common/services/modeService';
export class MockMode extends Disposable implements IMode {
private _languageIdentifier: LanguageIdentifier;
private readonly _languageIdentifier: LanguageIdentifier;
constructor(languageIdentifier: LanguageIdentifier) {
super();

2
src/vs/editor/test/common/mocks/testConfiguration.ts
View File

@@ -3,10 +3,10 @@
* Licensed under the Source EULA. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/
import { AccessibilitySupport } from 'vs/base/common/platform';
import { CommonEditorConfiguration, IEnvConfiguration } from 'vs/editor/common/config/commonEditorConfig';
import { IEditorOptions } from 'vs/editor/common/config/editorOptions';
import { BareFontInfo, FontInfo } from 'vs/editor/common/config/fontInfo';
import { AccessibilitySupport } from 'vs/platform/accessibility/common/accessibility';
export class TestConfiguration extends CommonEditorConfiguration {