mirror of
https://github.com/ckaczor/azuredatastudio.git
synced 2026-03-11 03:51:37 -04:00
* Merge from vscode bead496a613e475819f89f08e9e882b841bc1fe8 * Bump distro * Upgrade GCC to 4.9 due to yarn install errors * Update build image * Fix bootstrap base url * Bump distro * Fix build errors * Update source map file * Disable checkbox for blocking migration issues (#15131) * disable checkbox for blocking issues * wip * disable checkbox fixes * fix strings * Remove duplicate tsec command * Default to off for tab color if settings not present * re-skip failing tests * Fix mocha error * Bump sqlite version & fix notebooks search view * Turn off esbuild warnings * Update esbuild log level * Fix overflowactionbar tests * Fix ts-ignore in dropdown tests * cleanup/fixes * Fix hygiene * Bundle in entire zone.js module * Remove extra constructor param * bump distro for web compile break * bump distro for web compile break v2 * Undo log level change * New distro * Fix integration test scripts * remove the "no yarn.lock changes" workflow * fix scripts v2 * Update unit test scripts * Ensure ads-kerberos2 updates in .vscodeignore * Try fix unit tests * Upload crash reports * remove nogpu * always upload crashes * Use bash script * Consolidate data/ext dir names * Create in tmp directory Co-authored-by: chlafreniere <hichise@gmail.com> Co-authored-by: Christopher Suh <chsuh@microsoft.com> Co-authored-by: chgagnon <chgagnon@microsoft.com>
26 lines
1006 B
TypeScript
26 lines
1006 B
TypeScript
/*---------------------------------------------------------------------------------------------
|
|
* Copyright (c) Microsoft Corporation. All rights reserved.
|
|
* Licensed under the Source EULA. See License.txt in the project root for license information.
|
|
*--------------------------------------------------------------------------------------------*/
|
|
|
|
import * as vscode from 'vscode';
|
|
|
|
declare const URL: typeof import('url').URL;
|
|
|
|
/**
|
|
* Tries to convert an url into a vscode uri and returns undefined if this is not possible.
|
|
* `url` can be absolute or relative.
|
|
*/
|
|
export function urlToUri(url: string, base: vscode.Uri): vscode.Uri | undefined {
|
|
try {
|
|
// `vscode.Uri.joinPath` cannot be used, since it understands
|
|
// `src` as path, not as relative url. This is problematic for query args.
|
|
const parsedUrl = new URL(url, base.toString());
|
|
const uri = vscode.Uri.parse(parsedUrl.toString());
|
|
return uri;
|
|
} catch (e) {
|
|
// Don't crash if `URL` cannot parse `src`.
|
|
return undefined;
|
|
}
|
|
}
|