development/vscode
development/vscode
1
0
Fork 0
mirror of https://github.com/Microsoft/vscode synced 2024-10-12 14:30:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

debt - use amd.ts in a few more places

Browse source
This commit is contained in:
Benjamin Pasero 2020-09-24 18:17:19 +02:00
parent 22dddaf4f7
commit 9ab2cad7ef
3 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/vs/workbench/contrib/welcome/page/browser/welcomePage.ts
View file

@ -46,6 +46,7 @@ import { IProductService } from 'vs/platform/product/common/productService';
import { IEditorOptions } from 'vs/platform/editor/common/editor';
import { IWorkbenchLayoutService } from 'vs/workbench/services/layout/browser/layoutService';
import { IViewletService } from 'vs/workbench/services/viewlet/browser/viewlet';
import { getUriFromAmdModule } from 'vs/base/common/amd';
const configurationKey = 'workbench.startupEditor';
const oldConfigurationKey = 'workbench.welcome.enabled';
@ -298,7 +299,7 @@ class WelcomePage extends Disposable {
const recentlyOpened = this.workspacesService.getRecentlyOpened();
const installedExtensions = this.instantiationService.invokeFunction(getInstalledExtensions);
const resource = URI.parse(require.toUrl('./vs_code_welcome_page'))
const resource = getUriFromAmdModule(require, './vs_code_welcome_page')
.with({
scheme: Schemas.walkThrough,
query: JSON.stringify({ moduleId: 'vs/workbench/contrib/welcome/page/browser/vs_code_welcome_page' })

4
src/vs/workbench/contrib/welcome/walkThrough/browser/editor/editorWalkThrough.ts
View file

@ -8,7 +8,7 @@ import { localize } from 'vs/nls';
import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
import { Action } from 'vs/base/common/actions';
import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
import { URI } from 'vs/base/common/uri';
import { getUriFromAmdModule } from 'vs/base/common/amd';
import { WalkThroughInput, WalkThroughInputOptions } from 'vs/workbench/contrib/welcome/walkThrough/browser/walkThroughInput';
import { Schemas } from 'vs/base/common/network';
import { IEditorInputFactory, EditorInput } from 'vs/workbench/common/editor';
@ -17,7 +17,7 @@ const typeId = 'workbench.editors.walkThroughInput';
const inputOptions: WalkThroughInputOptions = {
typeId,
name: localize('editorWalkThrough.title', "Interactive Playground"),
resource: URI.parse(require.toUrl('./vs_code_editor_walkthrough.md'))
resource: getUriFromAmdModule(require, './vs_code_editor_walkthrough.md')
.with({
scheme: Schemas.walkThrough,
query: JSON.stringify({ moduleId: 'vs/workbench/contrib/welcome/walkThrough/browser/editor/vs_code_editor_walkthrough' })

3
src/vs/workbench/services/extensionManagement/browser/builtinExtensionsScannerService.ts
View file

@ -10,6 +10,7 @@ import { IUriIdentityService } from 'vs/workbench/services/uriIdentity/common/ur
import { registerSingleton } from 'vs/platform/instantiation/common/extensions';
import { URI } from 'vs/base/common/uri';
import { getGalleryExtensionId } from 'vs/platform/extensionManagement/common/extensionManagementUtil';
import { getUriFromAmdModule } from 'vs/base/common/amd';
interface IScannedBuiltinExtension {
extensionPath: string;
@ -69,7 +70,7 @@ export class BuiltinExtensionsScannerService implements IBuiltinExtensionsScanne
enableBuiltinExtensions = environmentService.configuration.remoteAuthority ? false : true;
}
if (enableBuiltinExtensions) {
return URI.parse(require.toUrl('../../../../../../extensions'));
return getUriFromAmdModule(require, '../../../../../../extensions');
}
return undefined;
}