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

Fix space folder link test

Browse Source 
Fixes #155532
See #155921
This commit is contained in:
Daniel Imms
2022-07-22 05:42:34 -07:00
parent 5f21c372de
commit ba8b7694ee
2 changed files with 68 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/vs/workbench/contrib/terminal/browser/links/terminalLinkOpeners.ts
+11 -11
View File
@@ -52,21 +52,21 @@ export class TerminalLocalFileLinkOpener implements ITerminalLinkOpener {
*
* @param link Url link which may contain line and column number.
*/
extractLineColumnInfo(link: string, uri?: URI): ILineColumnInfo {
extractLineColumnInfo(link: string, uri: URI): ILineColumnInfo {
const lineColumnInfo: ILineColumnInfo = {
lineNumber: 1,
columnNumber: 1
};
// If a URI was passed in the exact file is known, sanitize the link text such that the
// folders and file name do not contain whitespace. The actual path isn't important in
// extracting the line and column from the regex so this is safe
if (uri) {
const fileName = basename(uri.path);
const index = link.indexOf(fileName);
const endIndex = index + fileName.length;
link = link.slice(0, endIndex).replace(/\s/g, '_') + link.slice(endIndex);
}
// Calculate the file name end using the URI if possible, this will help with sanitizing the
// link for the match regex. The actual path isn't important in extracting the line and
// column from the regex so modifying the link text before the file name is safe.
const fileName = basename(uri.path);
const index = link.indexOf(fileName);
const fileNameEndIndex: number = index !== -1 ? index + fileName.length : link.length;
// Sanitize the link text such that the folders and file name do not contain whitespace.
link = link.slice(0, fileNameEndIndex).replace(/\s/g, '_') + link.slice(fileNameEndIndex);
// The local link regex only works for non file:// links, check these for a simple
// `:line:col` suffix
@@ -259,7 +259,7 @@ export class TerminalSearchLinkOpener implements ITerminalLinkOpener {
const { uri, isDirectory } = result;
const linkToOpen = {
// Use the absolute URI's path here so the optional line/col get detected
text: result.uri.fsPath + (text.match(/:\d+(:\d+)?$/)?.[0] || ''),
text: result.uri.path + (text.match(/:\d+(:\d+)?$/)?.[0] || ''),
uri,
bufferRange: link.bufferRange,
type: link.type
src/vs/workbench/contrib/terminal/test/browser/links/terminalLinkOpeners.test.ts
+57 -22
View File
@@ -170,28 +170,6 @@ suite('Workbench - TerminalLinkOpeners', () => {
});
});
test.skip('should extract line and column from links in a workspace containing spaces', async () => {
localFileOpener = instantiationService.createInstance(TerminalLocalFileLinkOpener, OperatingSystem.Linux);
const localFolderOpener = instantiationService.createInstance(TerminalLocalFolderInWorkspaceLinkOpener);
opener = instantiationService.createInstance(TerminalSearchLinkOpener, capabilities, Promise.resolve('/space folder'), localFileOpener, localFolderOpener, OperatingSystem.Linux);
fileService.setFiles([
URI.from({ scheme: Schemas.file, path: '/space folder/foo/bar.txt' })
]);
await opener.open({
text: './foo/bar.txt:10:5',
bufferRange: { start: { x: 1, y: 1 }, end: { x: 8, y: 1 } },
type: TerminalBuiltinLinkType.Search
});
deepStrictEqual(activationResult, {
link: 'file:///space%20folder/foo/bar.txt',
source: 'editor',
selection: {
startColumn: 5,
startLineNumber: 10
},
});
});
suite('macOS/Linux', () => {
setup(() => {
localFileOpener = instantiationService.createInstance(TerminalLocalFileLinkOpener, OperatingSystem.Linux);
@@ -239,6 +217,28 @@ suite('Workbench - TerminalLinkOpeners', () => {
source: 'search'
});
});
test('should extract line and column from links in a workspace containing spaces', async () => {
localFileOpener = instantiationService.createInstance(TerminalLocalFileLinkOpener, OperatingSystem.Linux);
const localFolderOpener = instantiationService.createInstance(TerminalLocalFolderInWorkspaceLinkOpener);
opener = instantiationService.createInstance(TerminalSearchLinkOpener, capabilities, Promise.resolve('/space folder'), localFileOpener, localFolderOpener, OperatingSystem.Linux);
fileService.setFiles([
URI.from({ scheme: Schemas.file, path: '/space folder/foo/bar.txt' })
]);
await opener.open({
text: './foo/bar.txt:10:5',
bufferRange: { start: { x: 1, y: 1 }, end: { x: 8, y: 1 } },
type: TerminalBuiltinLinkType.Search
});
deepStrictEqual(activationResult, {
link: 'file:///space%20folder/foo/bar.txt',
source: 'editor',
selection: {
startColumn: 5,
startLineNumber: 10
},
});
});
});
suite('Windows', () => {
@@ -288,6 +288,41 @@ suite('Workbench - TerminalLinkOpeners', () => {
source: 'search'
});
});
test('should extract line and column from links in a workspace containing spaces', async () => {
localFileOpener = instantiationService.createInstance(TerminalLocalFileLinkOpener, OperatingSystem.Windows);
const localFolderOpener = instantiationService.createInstance(TerminalLocalFolderInWorkspaceLinkOpener);
opener = instantiationService.createInstance(TerminalSearchLinkOpener, capabilities, Promise.resolve('/space folder'), localFileOpener, localFolderOpener, OperatingSystem.Windows);
fileService.setFiles([
URI.from({ scheme: Schemas.file, path: '/space folder/foo/bar.txt' })
]);
await opener.open({
text: './foo/bar.txt:10:5',
bufferRange: { start: { x: 1, y: 1 }, end: { x: 8, y: 1 } },
type: TerminalBuiltinLinkType.Search
});
deepStrictEqual(activationResult, {
link: 'file:///space%20folder/foo/bar.txt',
source: 'editor',
selection: {
startColumn: 5,
startLineNumber: 10
},
});
await opener.open({
text: '.\\foo\\bar.txt:10:5',
bufferRange: { start: { x: 1, y: 1 }, end: { x: 8, y: 1 } },
type: TerminalBuiltinLinkType.Search
});
deepStrictEqual(activationResult, {
link: 'file:///space%20folder/foo/bar.txt',
source: 'editor',
selection: {
startColumn: 5,
startLineNumber: 10
},
});
});
});
});
});