Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2025-12-24 20:26:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into fix-71570

Browse Source 
* upstream/master: (34 commits)
  Fix markdown.styled regression caused by Uri.parse changes
  Process explorer refactoring
  fix compile error
  fix open workspace uri from cli
  Delete deprecated search provider stub
  test dependenices are devDependencies
  Fix default uri when scheme is file
  disable flaky test, #71801
  use `readonly T[]` instead of `ReadonlyArray<T>`
  simplify protocol check
  Let enablment service handles local workspace extensions in remote window
  debt - make ext host init data more complete
  Fix colorization tests
  fixes #71671
  Update grammars
  Add yes-no choice for overwriting existing file for save as
  update distro
  ExtensionEnablementService: - Remove getDisabledExtensions and instead use isEnabled or getEnablementState methods
  Simplify reload action and fix test
  Update distro hash
  ...
This commit is contained in:
pkoushik
2019-04-06 12:17:00 +05:30
parent 3cef5067be f44e51ed38
commit 10a4ebf006
80 changed files with 1884 additions and 1168 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
extensions/markdown-language-features/src/features/previewContentProvider.ts
View File

@@ -113,21 +113,19 @@ export class MarkdownContentProvider {
return href;
}
// Use href if it is already an URL
const hrefUri = vscode.Uri.parse(href);
if (['http', 'https'].indexOf(hrefUri.scheme) >= 0) {
return hrefUri.toString(true);
if (href.startsWith('http:') || href.startsWith('https:') || href.startsWith('file:')) {
return href;
}
// Use href as file URI if it is absolute
if (path.isAbsolute(href) || hrefUri.scheme === 'file') {
// Assume it must be a local file
if (path.isAbsolute(href)) {
return vscode.Uri.file(href)
.with({ scheme: 'vscode-resource' })
.toString();
}
// Use a workspace relative path if there is a workspace
let root = vscode.workspace.getWorkspaceFolder(resource);
const root = vscode.workspace.getWorkspaceFolder(resource);
if (root) {
return vscode.Uri.file(path.join(root.uri.fsPath, href))
.with({ scheme: 'vscode-resource' })