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

Merge VS Code 1.21 source code (#1067)

Browse Source 
* Initial VS Code 1.21 file copy with patches

* A few more merges

* Post npm install

* Fix batch of build breaks

* Fix more build breaks

* Fix more build errors

* Fix more build breaks

* Runtime fixes 1

* Get connection dialog working with some todos

* Fix a few packaging issues

* Copy several node_modules to package build to fix loader issues

* Fix breaks from master

* A few more fixes

* Make tests pass

* First pass of license header updates

* Second pass of license header updates

* Fix restore dialog issues

* Remove add additional themes menu items

* fix select box issues where the list doesn't show up

* formatting

* Fix editor dispose issue

* Copy over node modules to correct location on all platforms
This commit is contained in:
Karl Burtram
2018-04-04 15:27:51 -07:00
committed by GitHub
parent 5fba3e31b4
commit dafb780987
9412 changed files with 141255 additions and 98813 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/vs/workbench/test/browser/parts/editor/rangeDecorations.test.ts
View File

@@ -12,11 +12,10 @@ import { IModeService } from 'vs/editor/common/services/modeService';
import { ModeServiceImpl } from 'vs/editor/common/services/modeServiceImpl';
import WorkbenchEditorService = require('vs/workbench/services/editor/common/editorService');
import { RangeHighlightDecorations } from 'vs/workbench/browser/parts/editor/rangeDecorations';
import { Model } from 'vs/editor/common/model/model';
import { TextModel } from 'vs/editor/common/model/textModel';
import { createTestCodeEditor } from 'vs/editor/test/browser/testCodeEditor';
import { IEditorInput } from 'vs/platform/editor/common/editor';
import { FileEditorInput } from 'vs/workbench/parts/files/common/editors/fileEditorInput';
import { TextModel } from 'vs/editor/common/model/textModel';
import { Range, IRange } from 'vs/editor/common/core/range';
import { Position } from 'vs/editor/common/core/position';
import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
@@ -29,10 +28,10 @@ suite('Editor - Range decorations', () => {
let instantiationService: TestInstantiationService;
let codeEditor: ICodeEditor;
let model: Model;
let model: TextModel;
let text: string;
let testObject: RangeHighlightDecorations;
let modelsToDispose: Model[] = [];
let modelsToDispose: TextModel[] = [];
setup(() => {
instantiationService = <TestInstantiationService>workbenchInstantiationService();
@@ -132,15 +131,15 @@ suite('Editor - Range decorations', () => {
assert.deepEqual([range], actuals);
});
function prepareActiveEditor(resource: string): Model {
function prepareActiveEditor(resource: string): TextModel {
let model = aModel(URI.file(resource));
codeEditor.setModel(model);
mockEditorService(model.uri);
return model;
}
function aModel(resource: URI, content: string = text): Model {
let model = Model.createFromString(content, TextModel.DEFAULT_CREATION_OPTIONS, null, resource);
function aModel(resource: URI, content: string = text): TextModel {
let model = TextModel.createFromString(content, TextModel.DEFAULT_CREATION_OPTIONS, null, resource);
modelsToDispose.push(model);
return model;
}
@@ -152,7 +151,7 @@ suite('Editor - Range decorations', () => {
instantiationService.stub(WorkbenchEditorService.IWorkbenchEditorService, 'getActiveEditorInput', editorInput);
}
function rangeHighlightDecorations(m: Model): IRange[] {
function rangeHighlightDecorations(m: TextModel): IRange[] {
let rangeHighlights: IRange[] = [];
for (let dec of m.getAllDecorations()) {

2
src/vs/workbench/test/browser/viewlet.test.ts
View File

@@ -15,7 +15,7 @@ suite('Workbench Viewlet', () => {
class TestViewlet extends Viewlet {
constructor() {
super('id', null, null);
super('id', null, null, null);
}
public layout(dimension: any): void {