development/vscode
development/vscode
1
0
Fork 0
mirror of https://github.com/Microsoft/vscode synced 2024-08-28 05:19:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use more standard values for scheme constants (#153367)

Browse source 
This drops the `:` from the scheme constants as it was easy to misuse this
This commit is contained in:
Matt Bierner 2022-06-27 13:35:17 -07:00 committed by GitHub
parent b78a8cef3d
commit fc709e2d35
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 15 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
extensions/markdown-language-features/src/commands/openDocumentLink.ts
View file

@ -7,6 +7,7 @@ import * as vscode from 'vscode';
import { Command } from '../commandManager';
import { MdTableOfContentsProvider } from '../tableOfContents';
import { openDocumentLink } from '../util/openDocumentLink';
import { Schemes } from '../util/schemes';
type UriComponents = {
readonly scheme?: string;
@ -59,7 +60,7 @@ export class OpenDocumentLinkCommand implements Command {
}
function reviveUri(parts: any) {
if (parts.scheme === 'file') {
if (parts.scheme === Schemes.file) {
return vscode.Uri.file(parts.path);
}
return vscode.Uri.parse('').with(parts);

3
extensions/markdown-language-features/src/languageFeatures/pathCompletions.ts
View file

@ -9,6 +9,7 @@ import { IMdParser } from '../markdownEngine';
import { TableOfContents } from '../tableOfContents';
import { ITextDocument } from '../types/textDocument';
import { resolveUriToMarkdownFile } from '../util/openDocumentLink';
import { Schemes } from '../util/schemes';
import { IMdWorkspace } from '../workspace';
import { MdLinkProvider } from './documentLinks';
@ -324,7 +325,7 @@ export class MdVsCodePathCompletionProvider implements vscode.CompletionItemProv
private resolvePath(root: vscode.Uri, ref: string): vscode.Uri | undefined {
try {
if (root.scheme === 'file') {
if (root.scheme === Schemes.file) {
return vscode.Uri.file(resolve(dirname(root.fsPath), ref));
} else {
return root.with({

22
extensions/markdown-language-features/src/util/schemes.ts
View file

@ -5,21 +5,21 @@
import * as vscode from 'vscode';
export const Schemes = {
http: 'http:',
https: 'https:',
file: 'file:',
export const Schemes = Object.freeze({
http: 'http',
https: 'https',
file: 'file',
untitled: 'untitled',
mailto: 'mailto:',
data: 'data:',
vscode: 'vscode:',
'vscode-insiders': 'vscode-insiders:',
mailto: 'mailto',
data: 'data',
vscode: 'vscode',
'vscode-insiders': 'vscode-insiders',
notebookCell: 'vscode-notebook-cell',
};
});
const knownSchemes = [
...Object.values(Schemes),
`${vscode.env.uriScheme}:`
`${vscode.env.uriScheme}`
];
export function getUriForLinkWithKnownExternalScheme(link: string): vscode.Uri | undefined {
@ -31,5 +31,5 @@ export function getUriForLinkWithKnownExternalScheme(link: string): vscode.Uri |
}
export function isOfScheme(scheme: string, link: string): boolean {
return link.toLowerCase().startsWith(scheme);
return link.toLowerCase().startsWith(scheme + ':');
}