Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-04-28 12:33:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

integration test fixes

Browse Source
This commit is contained in:
Martin Aeschlimann
2019-02-22 23:20:17 +01:00
parent 59ba3f853d
commit aa575b1e8a
2 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
extensions/vscode-api-tests/src/singlefolder-tests/languages.test.ts
View File

@@ -10,6 +10,8 @@ import { createRandomFile } from '../utils';
suite('languages namespace tests', () => {
const isWindows = process.platform === 'win32';
function positionToString(p: vscode.Position) {
return `[${p.character}/${p.line}]`;
}
@@ -93,7 +95,7 @@ suite('languages namespace tests', () => {
const uri = await createRandomFile('class A { // http://a.com }', undefined, '.java');
const doc = await vscode.workspace.openTextDocument(uri);
const target = vscode.Uri.parse('file://foo/bar');
const target = vscode.Uri.file(isWindows ? 'c:\\foo\\bar' : '/foo/bar');
const range = new vscode.Range(new vscode.Position(0, 0), new vscode.Position(0, 5));
const linkProvider: vscode.DocumentLinkProvider = {

12
src/vs/workbench/contrib/themes/test/electron-browser/themes.test.contribution.ts
View File

@@ -3,10 +3,8 @@
* Licensed under the MIT License. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/
import { basename } from 'vs/base/common/path';
import { URI } from 'vs/base/common/uri';
import { IModeService } from 'vs/editor/common/services/modeService';
import * as pfs from 'vs/base/node/pfs';
import { CommandsRegistry } from 'vs/platform/commands/common/commands';
import { IInstantiationService, ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
import { IWorkbenchThemeService, IColorTheme } from 'vs/workbench/services/themes/common/workbenchThemeService';
@@ -17,6 +15,8 @@ import { IGrammar, StackElement } from 'vscode-textmate';
import { TokenizationRegistry, TokenMetadata } from 'vs/editor/common/modes';
import { ThemeRule, findMatchingThemeRule } from 'vs/workbench/services/textMate/common/TMHelper';
import { Color } from 'vs/base/common/color';
import { IFileService } from 'vs/platform/files/common/files';
import { basename } from 'vs/base/common/resources';
interface IToken {
c: string;
@@ -230,12 +230,12 @@ class Snapper {
CommandsRegistry.registerCommand('_workbench.captureSyntaxTokens', function (accessor: ServicesAccessor, resource: URI) {
let process = (resource: URI) => {
let filePath = resource.fsPath;
let fileName = basename(filePath);
let fileService = accessor.get(IFileService);
let fileName = basename(resource);
let snapper = accessor.get(IInstantiationService).createInstance(Snapper);
return pfs.readFile(filePath).then(content => {
return snapper.captureSyntaxTokens(fileName, content.toString());
return fileService.resolveContent(resource).then(content => {
return snapper.captureSyntaxTokens(fileName, content.value);
});
};