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

Merge from vscode 4636be2b71c87bfb0bfe3c94278b447a5efcc1f1 (#8722)

Browse Source 
* Merge from vscode 4636be2b71c87bfb0bfe3c94278b447a5efcc1f1

* remove tests that aren't working
This commit is contained in:
Anthony Dresser
2019-12-18 00:14:28 -08:00
committed by GitHub
parent 0fd870d156
commit 30d9e9c141
289 changed files with 5537 additions and 3039 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/vs/editor/test/common/services/modelService.test.ts
View File

@@ -13,7 +13,7 @@ import { createStringBuilder } from 'vs/editor/common/core/stringBuilder';
import { DefaultEndOfLine } from 'vs/editor/common/model';
import { TextModel, createTextBuffer } from 'vs/editor/common/model/textModel';
import { ModelServiceImpl } from 'vs/editor/common/services/modelServiceImpl';
import { ITextResourcePropertiesService } from 'vs/editor/common/services/resourceConfiguration';
import { ITextResourcePropertiesService } from 'vs/editor/common/services/textResourceConfigurationService';
import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
import { TestConfigurationService } from 'vs/platform/configuration/test/common/testConfigurationService';
import { TestThemeService } from 'vs/platform/theme/test/common/testThemeService';

120
src/vs/editor/test/common/services/resourceConfigurationService.test.ts → src/vs/editor/test/common/services/textResourceConfigurationService.test.ts
View File

@@ -9,7 +9,7 @@ import { TestInstantiationService } from 'vs/platform/instantiation/test/common/
import { IModelService } from 'vs/editor/common/services/modelService';
import { IModeService } from 'vs/editor/common/services/modeService';
import { IConfigurationValue, IConfigurationService, ConfigurationTarget } from 'vs/platform/configuration/common/configuration';
import { TextResourceConfigurationService } from 'vs/editor/common/services/resourceConfigurationImpl';
import { TextResourceConfigurationService } from 'vs/editor/common/services/textResourceConfigurationServiceImpl';
import { URI } from 'vs/base/common/uri';
@@ -52,9 +52,9 @@ suite('TextResourceConfigurationService - Update', () => {
test('updateValue writes into given memory target without overrides', async () => {
language = 'a';
configurationValue = {
defaultTarget: { value: '1' },
userLocalTarget: { value: '2' },
workspaceFolderTarget: { value: '1' },
default: { value: '1' },
userLocal: { value: '2' },
workspaceFolder: { value: '1' },
};
const resource = URI.file('someFile');
@@ -65,9 +65,9 @@ suite('TextResourceConfigurationService - Update', () => {
test('updateValue writes into given workspace target without overrides', async () => {
language = 'a';
configurationValue = {
defaultTarget: { value: '1' },
userLocalTarget: { value: '2' },
workspaceFolderTarget: { value: '2' },
default: { value: '1' },
userLocal: { value: '2' },
workspaceFolder: { value: '2' },
};
const resource = URI.file('someFile');
@@ -78,9 +78,9 @@ suite('TextResourceConfigurationService - Update', () => {
test('updateValue writes into given user target without overrides', async () => {
language = 'a';
configurationValue = {
defaultTarget: { value: '1' },
userLocalTarget: { value: '2' },
workspaceFolderTarget: { value: '2' },
default: { value: '1' },
userLocal: { value: '2' },
workspaceFolder: { value: '2' },
};
const resource = URI.file('someFile');
@@ -91,9 +91,9 @@ suite('TextResourceConfigurationService - Update', () => {
test('updateValue writes into given workspace folder target with overrides', async () => {
language = 'a';
configurationValue = {
defaultTarget: { value: '1' },
userLocalTarget: { value: '2' },
workspaceFolderTarget: { value: '2', override: '1' },
default: { value: '1' },
userLocal: { value: '2' },
workspaceFolder: { value: '2', override: '1' },
};
const resource = URI.file('someFile');
@@ -104,9 +104,9 @@ suite('TextResourceConfigurationService - Update', () => {
test('updateValue writes into derived workspace folder target without overrides', async () => {
language = 'a';
configurationValue = {
defaultTarget: { value: '1' },
userLocalTarget: { value: '2' },
workspaceFolderTarget: { value: '2' },
default: { value: '1' },
userLocal: { value: '2' },
workspaceFolder: { value: '2' },
};
const resource = URI.file('someFile');
@@ -117,10 +117,10 @@ suite('TextResourceConfigurationService - Update', () => {
test('updateValue writes into derived workspace folder target with overrides', async () => {
language = 'a';
configurationValue = {
defaultTarget: { value: '1' },
userLocalTarget: { value: '2' },
workspaceTarget: { value: '2', override: '1' },
workspaceFolderTarget: { value: '2', override: '2' },
default: { value: '1' },
userLocal: { value: '2' },
workspace: { value: '2', override: '1' },
workspaceFolder: { value: '2', override: '2' },
};
const resource = URI.file('someFile');
@@ -131,9 +131,9 @@ suite('TextResourceConfigurationService - Update', () => {
test('updateValue writes into derived workspace target without overrides', async () => {
language = 'a';
configurationValue = {
defaultTarget: { value: '1' },
userLocalTarget: { value: '2' },
workspaceTarget: { value: '2' },
default: { value: '1' },
userLocal: { value: '2' },
workspace: { value: '2' },
};
const resource = URI.file('someFile');
@@ -144,9 +144,9 @@ suite('TextResourceConfigurationService - Update', () => {
test('updateValue writes into derived workspace target with overrides', async () => {
language = 'a';
configurationValue = {
defaultTarget: { value: '1' },
userLocalTarget: { value: '2' },
workspaceTarget: { value: '2', override: '2' },
default: { value: '1' },
userLocal: { value: '2' },
workspace: { value: '2', override: '2' },
};
const resource = URI.file('someFile');
@@ -157,10 +157,10 @@ suite('TextResourceConfigurationService - Update', () => {
test('updateValue writes into derived workspace target with overrides and value defined in folder', async () => {
language = 'a';
configurationValue = {
defaultTarget: { value: '1', override: '3' },
userLocalTarget: { value: '2' },
workspaceTarget: { value: '2', override: '2' },
workspaceFolderTarget: { value: '2' },
default: { value: '1', override: '3' },
userLocal: { value: '2' },
workspace: { value: '2', override: '2' },
workspaceFolder: { value: '2' },
};
const resource = URI.file('someFile');
@@ -171,9 +171,9 @@ suite('TextResourceConfigurationService - Update', () => {
test('updateValue writes into derived user remote target without overrides', async () => {
language = 'a';
configurationValue = {
defaultTarget: { value: '1' },
userLocalTarget: { value: '2' },
userRemoteTarget: { value: '2' },
default: { value: '1' },
userLocal: { value: '2' },
userRemote: { value: '2' },
};
const resource = URI.file('someFile');
@@ -184,9 +184,9 @@ suite('TextResourceConfigurationService - Update', () => {
test('updateValue writes into derived user remote target with overrides', async () => {
language = 'a';
configurationValue = {
defaultTarget: { value: '1' },
userLocalTarget: { value: '2' },
userRemoteTarget: { value: '2', override: '3' },
default: { value: '1' },
userLocal: { value: '2' },
userRemote: { value: '2', override: '3' },
};
const resource = URI.file('someFile');
@@ -197,10 +197,10 @@ suite('TextResourceConfigurationService - Update', () => {
test('updateValue writes into derived user remote target with overrides and value defined in workspace', async () => {
language = 'a';
configurationValue = {
defaultTarget: { value: '1' },
userLocalTarget: { value: '2' },
userRemoteTarget: { value: '2', override: '3' },
workspaceTarget: { value: '3' }
default: { value: '1' },
userLocal: { value: '2' },
userRemote: { value: '2', override: '3' },
workspace: { value: '3' }
};
const resource = URI.file('someFile');
@@ -211,11 +211,11 @@ suite('TextResourceConfigurationService - Update', () => {
test('updateValue writes into derived user remote target with overrides and value defined in workspace folder', async () => {
language = 'a';
configurationValue = {
defaultTarget: { value: '1' },
userLocalTarget: { value: '2', override: '1' },
userRemoteTarget: { value: '2', override: '3' },
workspaceTarget: { value: '3' },
workspaceFolderTarget: { value: '3' }
default: { value: '1' },
userLocal: { value: '2', override: '1' },
userRemote: { value: '2', override: '3' },
workspace: { value: '3' },
workspaceFolder: { value: '3' }
};
const resource = URI.file('someFile');
@@ -226,8 +226,8 @@ suite('TextResourceConfigurationService - Update', () => {
test('updateValue writes into derived user target without overrides', async () => {
language = 'a';
configurationValue = {
defaultTarget: { value: '1' },
userLocalTarget: { value: '2' },
default: { value: '1' },
userLocal: { value: '2' },
};
const resource = URI.file('someFile');
@@ -238,8 +238,8 @@ suite('TextResourceConfigurationService - Update', () => {
test('updateValue writes into derived user target with overrides', async () => {
language = 'a';
configurationValue = {
defaultTarget: { value: '1' },
userLocalTarget: { value: '2', override: '3' },
default: { value: '1' },
userLocal: { value: '2', override: '3' },
};
const resource = URI.file('someFile');
@@ -250,9 +250,9 @@ suite('TextResourceConfigurationService - Update', () => {
test('updateValue writes into derived user target with overrides and value is defined in remote', async () => {
language = 'a';
configurationValue = {
defaultTarget: { value: '1' },
userLocalTarget: { value: '2', override: '3' },
userRemoteTarget: { value: '3' }
default: { value: '1' },
userLocal: { value: '2', override: '3' },
userRemote: { value: '3' }
};
const resource = URI.file('someFile');
@@ -263,9 +263,9 @@ suite('TextResourceConfigurationService - Update', () => {
test('updateValue writes into derived user target with overrides and value is defined in workspace', async () => {
language = 'a';
configurationValue = {
defaultTarget: { value: '1' },
userLocalTarget: { value: '2', override: '3' },
workspace: { value: '3' }
default: { value: '1' },
userLocal: { value: '2', override: '3' },
workspaceValue: { value: '3' }
};
const resource = URI.file('someFile');
@@ -276,10 +276,10 @@ suite('TextResourceConfigurationService - Update', () => {
test('updateValue writes into derived user target with overrides and value is defined in workspace folder', async () => {
language = 'a';
configurationValue = {
defaultTarget: { value: '1', override: '3' },
userLocalTarget: { value: '2', override: '3' },
userRemoteTarget: { value: '3' },
workspaceFolder: { value: '3' }
default: { value: '1', override: '3' },
userLocal: { value: '2', override: '3' },
userRemote: { value: '3' },
workspaceFolderValue: { value: '3' }
};
const resource = URI.file('someFile');
@@ -290,7 +290,7 @@ suite('TextResourceConfigurationService - Update', () => {
test('updateValue when not changed', async () => {
language = 'a';
configurationValue = {
defaultTarget: { value: '1' },
default: { value: '1' },
};
const resource = URI.file('someFile');

2
src/vs/editor/test/node/classification/typescript-test.ts
View File

@@ -57,7 +57,7 @@ const x16 = / x07; /.test('3');
/// ^^^^^^^^ regex
/// ^^^ string
const x17 = `.dialog-modal-block${true ? '.dimmed' : ''}`;
const x17 = `.monaco-dialog-modal-block${true ? '.dimmed' : ''}`;
/// ^^^^^^^^^^^^^^^^^^^^^^ string
/// ^^^^^^^^^ string
/// ^^^^ string