Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-04-24 10:38:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

outputLinkComputer: remove usage of normalizeWithSlashes

Browse Source
This commit is contained in:
Martin Aeschlimann
2019-02-18 15:42:47 +01:00
parent ce88f65a88
commit 85cc4a86a0
2 changed files with 45 additions and 195 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/vs/workbench/contrib/output/common/outputLinkComputer.ts
View File

@@ -8,10 +8,10 @@ import { ILink } from 'vs/editor/common/modes';
import { URI } from 'vs/base/common/uri';
import * as extpath from 'vs/base/common/extpath';
import * as resources from 'vs/base/common/resources';
import * as path from 'vs/base/common/path';
import * as strings from 'vs/base/common/strings';
import * as arrays from 'vs/base/common/arrays';
import { Range } from 'vs/editor/common/core/range';
import { isWindows } from 'vs/base/common/platform';
import { Schemas } from 'vs/base/common/network';
export interface ICreateData {
workspaceFolders: string[];
@@ -87,11 +87,11 @@ export class OutputLinkComputer {
public static createPatterns(workspaceFolder: URI): RegExp[] {
const patterns: RegExp[] = [];
const workspaceFolderPath = workspaceFolder.scheme === 'file' ? workspaceFolder.fsPath : workspaceFolder.path;
const workspaceFolderVariants = arrays.distinct([
path.normalize(workspaceFolderPath),
extpath.normalizeWithSlashes(workspaceFolderPath)
]);
const workspaceFolderPath = workspaceFolder.scheme === Schemas.file ? workspaceFolder.fsPath : workspaceFolder.path;
const workspaceFolderVariants = [workspaceFolderPath];
if (isWindows && workspaceFolder.scheme === Schemas.file) {
workspaceFolderVariants.push(extpath.toSlashes(workspaceFolderPath));
}
workspaceFolderVariants.forEach(workspaceFolderVariant => {
const validPathCharacterPattern = '[^\\s\\(\\):<>"]';