Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-05-08 09:08:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

adopt merge

Browse Source
This commit is contained in:
Martin Aeschlimann
2019-11-06 11:56:05 +01:00
parent c504a89202
commit 5b6f03e8c6
2 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/vs/workbench/services/extensionResourceLoader/electron-browser/extensionResourceLoaderService.ts
+1 -1
View File
@@ -8,7 +8,7 @@ import { registerSingleton } from 'vs/platform/instantiation/common/extensions';
import { IFileService } from 'vs/platform/files/common/files'; import { IFileService } from 'vs/platform/files/common/files';
import { IExtensionResourceLoaderService } from 'vs/workbench/services/extensionResourceLoader/common/extensionResourceLoader'; import { IExtensionResourceLoaderService } from 'vs/workbench/services/extensionResourceLoader/common/extensionResourceLoader';
class ExtensionResourceLoaderService implements IExtensionResourceLoaderService { export class ExtensionResourceLoaderService implements IExtensionResourceLoaderService {
_serviceBrand: undefined; _serviceBrand: undefined;
src/vs/workbench/services/themes/test/electron-browser/tokenStyleResolving.test.ts
+10 -7
View File
@@ -15,6 +15,7 @@ import { DiskFileSystemProvider } from 'vs/platform/files/node/diskFileSystemPro
import { Schemas } from 'vs/base/common/network'; import { Schemas } from 'vs/base/common/network';
import { URI } from 'vs/base/common/uri'; import { URI } from 'vs/base/common/uri';
import { getPathFromAmdModule } from 'vs/base/common/amd'; import { getPathFromAmdModule } from 'vs/base/common/amd';
import { ExtensionResourceLoaderService } from 'vs/workbench/services/extensionResourceLoader/electron-browser/extensionResourceLoaderService';
let tokenClassificationRegistry = getTokenClassificationRegistry(); let tokenClassificationRegistry = getTokenClassificationRegistry();
@@ -69,6 +70,8 @@ suite('Themes - TokenStyleResolving', () => {
const fileService = new FileService(new NullLogService()); const fileService = new FileService(new NullLogService());
const extensionResourceLoaderService = new ExtensionResourceLoaderService(fileService);
const diskFileSystemProvider = new DiskFileSystemProvider(new NullLogService()); const diskFileSystemProvider = new DiskFileSystemProvider(new NullLogService());
fileService.registerProvider(Schemas.file, diskFileSystemProvider); fileService.registerProvider(Schemas.file, diskFileSystemProvider);
@@ -77,12 +80,12 @@ suite('Themes - TokenStyleResolving', () => {
const themeData = ColorThemeData.createUnloadedTheme('foo'); const themeData = ColorThemeData.createUnloadedTheme('foo');
const themeLocation = getPathFromAmdModule(require, '../../../../../../../extensions/theme-monokai/themes/monokai-color-theme.json'); const themeLocation = getPathFromAmdModule(require, '../../../../../../../extensions/theme-monokai/themes/monokai-color-theme.json');
themeData.location = URI.file(themeLocation); themeData.location = URI.file(themeLocation);
await themeData.ensureLoaded(fileService); await themeData.ensureLoaded(extensionResourceLoaderService);
assert.equal(themeData.isLoaded, true); assert.equal(themeData.isLoaded, true);
assertTokenStyles(themeData, { assertTokenStyles(themeData, {
[comments]: ts('#75715E', unsetStyle), [comments]: ts('#88846f', unsetStyle),
[variables]: ts('#F8F8F2', unsetStyle), [variables]: ts('#F8F8F2', unsetStyle),
[types]: ts('#A6E22E', { underline: true, bold: false, italic: false }), [types]: ts('#A6E22E', { underline: true, bold: false, italic: false }),
[functions]: ts('#A6E22E', unsetStyle), [functions]: ts('#A6E22E', unsetStyle),
@@ -97,7 +100,7 @@ suite('Themes - TokenStyleResolving', () => {
const themeData = ColorThemeData.createUnloadedTheme('foo'); const themeData = ColorThemeData.createUnloadedTheme('foo');
const themeLocation = getPathFromAmdModule(require, '../../../../../../../extensions/theme-defaults/themes/dark_plus.json'); const themeLocation = getPathFromAmdModule(require, '../../../../../../../extensions/theme-defaults/themes/dark_plus.json');
themeData.location = URI.file(themeLocation); themeData.location = URI.file(themeLocation);
await themeData.ensureLoaded(fileService); await themeData.ensureLoaded(extensionResourceLoaderService);
assert.equal(themeData.isLoaded, true); assert.equal(themeData.isLoaded, true);
@@ -117,7 +120,7 @@ suite('Themes - TokenStyleResolving', () => {
const themeData = ColorThemeData.createUnloadedTheme('foo'); const themeData = ColorThemeData.createUnloadedTheme('foo');
const themeLocation = getPathFromAmdModule(require, '../../../../../../../extensions/theme-defaults/themes/light_vs.json'); const themeLocation = getPathFromAmdModule(require, '../../../../../../../extensions/theme-defaults/themes/light_vs.json');
themeData.location = URI.file(themeLocation); themeData.location = URI.file(themeLocation);
await themeData.ensureLoaded(fileService); await themeData.ensureLoaded(extensionResourceLoaderService);
assert.equal(themeData.isLoaded, true); assert.equal(themeData.isLoaded, true);
@@ -137,7 +140,7 @@ suite('Themes - TokenStyleResolving', () => {
const themeData = ColorThemeData.createUnloadedTheme('foo'); const themeData = ColorThemeData.createUnloadedTheme('foo');
const themeLocation = getPathFromAmdModule(require, '../../../../../../../extensions/theme-defaults/themes/hc_black.json'); const themeLocation = getPathFromAmdModule(require, '../../../../../../../extensions/theme-defaults/themes/hc_black.json');
themeData.location = URI.file(themeLocation); themeData.location = URI.file(themeLocation);
await themeData.ensureLoaded(fileService); await themeData.ensureLoaded(extensionResourceLoaderService);
assert.equal(themeData.isLoaded, true); assert.equal(themeData.isLoaded, true);
@@ -157,7 +160,7 @@ suite('Themes - TokenStyleResolving', () => {
const themeData = ColorThemeData.createUnloadedTheme('foo'); const themeData = ColorThemeData.createUnloadedTheme('foo');
const themeLocation = getPathFromAmdModule(require, '../../../../../../../extensions/theme-kimbie-dark/themes/kimbie-dark-color-theme.json'); const themeLocation = getPathFromAmdModule(require, '../../../../../../../extensions/theme-kimbie-dark/themes/kimbie-dark-color-theme.json');
themeData.location = URI.file(themeLocation); themeData.location = URI.file(themeLocation);
await themeData.ensureLoaded(fileService); await themeData.ensureLoaded(extensionResourceLoaderService);
assert.equal(themeData.isLoaded, true); assert.equal(themeData.isLoaded, true);
@@ -177,7 +180,7 @@ suite('Themes - TokenStyleResolving', () => {
const themeData = ColorThemeData.createUnloadedTheme('foo'); const themeData = ColorThemeData.createUnloadedTheme('foo');
const themeLocation = getPathFromAmdModule(require, '../../../../../../../extensions/theme-abyss/themes/abyss-color-theme.json'); const themeLocation = getPathFromAmdModule(require, '../../../../../../../extensions/theme-abyss/themes/abyss-color-theme.json');
themeData.location = URI.file(themeLocation); themeData.location = URI.file(themeLocation);
await themeData.ensureLoaded(fileService); await themeData.ensureLoaded(extensionResourceLoaderService);
assert.equal(themeData.isLoaded, true); assert.equal(themeData.isLoaded, true);