@codingame/monaco-vscode-walkthrough-service-override 8.0.4 → 9.0.0

package/vscode/src/vs/workbench/contrib/welcomeGettingStarted/common/media/notebookProfile.js

@@ -3,23 +3,23 @@ import { localize } from 'vscode/vscode/vs/nls';
 
 const profileArg = (profile) => encodeURIComponent(JSON.stringify({ profile }));
 const imageSize = 400;
-var notebookProfile = () => `
+var notebookProfileContent = () => `
 <vertically-centered>
 <checklist>
 	<checkbox on-checked="command:notebook.setProfile?${profileArg('default')}" checked-on="config.notebook.cellFocusIndicator == 'border' && config.notebook.insertToolbarLocation == 'both' && config.notebook.globalToolbar == false && config.notebook.compactView == true && config.notebook.showCellStatusBar == 'visible'">
 		<img width="${imageSize}" src="./notebookThemes/default.png"/>
-		${escape(( localize(3248, "Default")))}
+		${escape(( localize(10635, "Default")))}
 	</checkbox>
 	<checkbox on-checked="command:notebook.setProfile?${profileArg('jupyter')}" checked-on="config.notebook.cellFocusIndicator == 'gutter' && config.notebook.insertToolbarLocation == 'notebookToolbar' && config.notebook.globalToolbar == true && config.notebook.compactView == true  && config.notebook.showCellStatusBar == 'visible'">
 		<img width="${imageSize}" src="./notebookThemes/jupyter.png"/>
-		${escape(( localize(3249, "Jupyter")))}
+		${escape(( localize(10636, "Jupyter")))}
 	</checkbox>
 	<checkbox on-checked="command:notebook.setProfile?${profileArg('colab')}" checked-on="config.notebook.cellFocusIndicator == 'border' && config.notebook.insertToolbarLocation == 'betweenCells' && config.notebook.globalToolbar == false && config.notebook.compactView == false && config.notebook.showCellStatusBar == 'hidden'">
 		<img width="${imageSize}" src="./notebookThemes/colab.png"/>
-		${escape(( localize(3250, "Colab")))}
+		${escape(( localize(10637, "Colab")))}
 	</checkbox>
 </checklist>
 </vertically-centered>
 `;
 
-export { notebookProfile as default };
+export { notebookProfileContent as default };

package/vscode/src/vs/workbench/contrib/welcomeGettingStarted/common/media/theme_picker.js

@@ -2,32 +2,32 @@ import { escape } from 'vscode/vscode/vs/base/common/strings';
 import { localize } from 'vscode/vscode/vs/nls';
 import { ThemeSettingDefaults } from 'vscode/vscode/vs/workbench/services/themes/common/workbenchThemeService';
 
-var theme_picker = () => `
+var themePickerContent = () => `
 <checklist>
 	<div class="theme-picker-row">
 		<checkbox when-checked="setTheme:${ThemeSettingDefaults.COLOR_THEME_DARK}" checked-on="config.workbench.colorTheme == '${ThemeSettingDefaults.COLOR_THEME_DARK}'">
 			<img width="200" src="./dark.png"/>
-			${escape(( localize(3243, "Dark Modern")))}
+			${escape(( localize(10630, "Dark Modern")))}
 		</checkbox>
 		<checkbox when-checked="setTheme:${ThemeSettingDefaults.COLOR_THEME_LIGHT}" checked-on="config.workbench.colorTheme == '${ThemeSettingDefaults.COLOR_THEME_LIGHT}'">
 			<img width="200" src="./light.png"/>
-			${escape(( localize(3244, "Light Modern")))}
+			${escape(( localize(10631, "Light Modern")))}
 		</checkbox>
 	</div>
 	<div class="theme-picker-row">
 		<checkbox when-checked="setTheme:${ThemeSettingDefaults.COLOR_THEME_HC_DARK}" checked-on="config.workbench.colorTheme == '${ThemeSettingDefaults.COLOR_THEME_HC_DARK}'">
 			<img width="200" src="./dark-hc.png"/>
-			${escape(( localize(3245, "Dark High Contrast")))}
+			${escape(( localize(10632, "Dark High Contrast")))}
 		</checkbox>
 		<checkbox when-checked="setTheme:${ThemeSettingDefaults.COLOR_THEME_HC_LIGHT}" checked-on="config.workbench.colorTheme == '${ThemeSettingDefaults.COLOR_THEME_HC_LIGHT}'">
 			<img width="200" src="./light-hc.png"/>
-			${escape(( localize(3246, "Light High Contrast")))}
+			${escape(( localize(10633, "Light High Contrast")))}
 		</checkbox>
 	</div>
 </checklist>
 <checkbox class="theme-picker-link" when-checked="command:workbench.action.selectTheme" checked-on="false">
-	${escape(( localize(3247, "See More Themes...")))}
+	${escape(( localize(10634, "See More Themes...")))}
 </checkbox>
 `;
 
-export { theme_picker as default };
+export { themePickerContent as default };

package/vscode/src/vs/workbench/contrib/welcomeWalkthrough/browser/editor/editorWalkThrough.js

@@ -1,16 +1,18 @@
-import 'vscode/vscode/vs/base/common/platform';
-import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
+import content from './vs_code_editor_walkthrough.js';
 import { localize, localize2 } from 'vscode/vscode/vs/nls';
 import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService.service';
+import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
 import { WalkThroughInput } from '../walkThroughInput.js';
 import { FileAccess, Schemas } from 'vscode/vscode/vs/base/common/network';
 import { Action2 } from 'vscode/vscode/vs/platform/actions/common/actions';
 import { Categories } from 'vscode/vscode/vs/platform/action/common/actionCommonCategories';
+import { walkThroughContentRegistry } from '../../common/walkThroughContentProvider.js';
 
+walkThroughContentRegistry.registerProvider('vs/workbench/contrib/welcomeWalkthrough/browser/editor/vs_code_editor_walkthrough', content);
 const typeId = 'workbench.editors.walkThroughInput';
 const inputOptions = {
     typeId,
-    name: ( localize(7583, "Editor Playground")),
+    name: ( localize(7495, "Editor Playground")),
     resource: ( (FileAccess.asBrowserUri(
         'vs/workbench/contrib/welcomeWalkthrough/browser/editor/vs_code_editor_walkthrough.md'
     )))
@@ -22,7 +24,7 @@ const inputOptions = {
 };
 class EditorWalkThroughAction extends Action2 {
     static { this.ID = 'workbench.action.showInteractivePlayground'; }
-    static { this.LABEL = ( localize2(7584, 'Interactive Editor Playground')); }
+    static { this.LABEL = ( localize2(7496, 'Interactive Editor Playground')); }
     constructor() {
         super({
             id: EditorWalkThroughAction.ID,
@@ -30,7 +32,7 @@ class EditorWalkThroughAction extends Action2 {
             category: Categories.Help,
             f1: true,
             metadata: {
-                description: ( localize2(7585, "Opens an interactive playground for learning about the editor."))
+                description: ( localize2(7497, "Opens an interactive playground for learning about the editor."))
             }
         });
     }

package/vscode/src/vs/workbench/contrib/welcomeWalkthrough/browser/walkThrough.contribution.js

@@ -13,7 +13,7 @@ import { EditorPaneDescriptor } from 'vscode/vscode/vs/workbench/browser/editor'
 import { KeybindingsRegistry } from 'vscode/vscode/vs/platform/keybinding/common/keybindingsRegistry';
 
 ( (Registry.as(EditorExtensions.EditorPane)))
-    .registerEditorPane(EditorPaneDescriptor.create(WalkThroughPart, WalkThroughPart.ID, ( localize(3241, "Playground"))), [( (new SyncDescriptor(WalkThroughInput)))]);
+    .registerEditorPane(EditorPaneDescriptor.create(WalkThroughPart, WalkThroughPart.ID, ( localize(2667, "Playground"))), [( (new SyncDescriptor(WalkThroughInput)))]);
 registerAction2(EditorWalkThroughAction);
 ( (Registry.as(EditorExtensions.EditorFactory))).registerEditorSerializer(EditorWalkThroughInputSerializer.ID, EditorWalkThroughInputSerializer);
 registerWorkbenchContribution2(WalkThroughSnippetContentProvider.ID, WalkThroughSnippetContentProvider, { editorTypeId: WalkThroughPart.ID });
@@ -25,7 +25,7 @@ MenuRegistry.appendMenuItem(MenuId.MenubarHelpMenu, {
     group: '1_welcome',
     command: {
         id: 'workbench.action.showInteractivePlayground',
-        title: ( localize(3242, "Editor Playgrou&&nd"))
+        title: ( localize(2668, "Editor Playgrou&&nd"))
     },
     order: 3
 });

package/vscode/src/vs/workbench/contrib/welcomeWalkthrough/browser/walkThroughInput.js

@@ -2,9 +2,9 @@ import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
 import { EditorInput } from 'vscode/vscode/vs/workbench/common/editor/editorInput';
 import { EditorModel } from 'vscode/vscode/vs/workbench/common/editor/editorModel';
 import { ITextModelService } from 'vscode/vscode/vs/editor/common/services/resolverService';
-import marked_1 from 'vscode/external/vscode-marked/lib/marked.esm.js';
+import { marked } from 'marked';
 import { isEqual } from 'vscode/vscode/vs/base/common/resources';
-import { requireToContent } from '../common/walkThroughContentProvider.js';
+import { moduleToContent } from '../common/walkThroughContentProvider.js';
 import { EditorInputCapabilities } from 'vscode/vscode/vs/workbench/common/editor';
 import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
 import { Schemas } from 'vscode/vscode/vs/base/common/network';
@@ -66,21 +66,21 @@ let WalkThroughInput = WalkThroughInput_1 = class WalkThroughInput extends Edito
     }
     resolve() {
         if (!this.promise) {
-            this.promise = requireToContent(this.instantiationService, this.options.resource)
+            this.promise = moduleToContent(this.instantiationService, this.options.resource)
                 .then(content => {
                 if (this.resource.path.endsWith('.html')) {
                     return ( new WalkThroughModel(content, []));
                 }
                 const snippets = [];
                 let i = 0;
-                const renderer = new marked_1.Renderer();
-                renderer.code = (code, lang) => {
+                const renderer = new marked.Renderer();
+                renderer.code = ({ lang }) => {
                     i++;
                     const resource = this.options.resource.with({ scheme: Schemas.walkThroughSnippet, fragment: `${i}.${lang}` });
                     snippets.push(this.textModelResolverService.createModelReference(resource));
                     return `<div id="snippet-${resource.fragment}" class="walkThroughEditorContainer" ></div>`;
                 };
-                content = marked_1(content, { renderer });
+                content = marked(content, { async: false, renderer });
                 return Promise.all(snippets)
                     .then(refs => ( new WalkThroughModel(content, refs)));
             });

package/vscode/src/vs/workbench/contrib/welcomeWalkthrough/browser/walkThroughPart.js

@@ -34,7 +34,7 @@ import { IExtensionService } from 'vscode/vscode/vs/workbench/services/extension
 
 var WalkThroughPart_1;
 const WALK_THROUGH_FOCUS = ( (new RawContextKey('interactivePlaygroundFocus', false)));
-const UNBOUND_COMMAND = ( localize(7581, "unbound"));
+const UNBOUND_COMMAND = ( localize(7493, "unbound"));
 const WALK_THROUGH_EDITOR_VIEW_STATE_PREFERENCE_KEY = 'walkThroughEditorViewState';
 let WalkThroughPart = class WalkThroughPart extends EditorPane {
     static { WalkThroughPart_1 = this; }
@@ -144,7 +144,7 @@ let WalkThroughPart = class WalkThroughPart extends EditorPane {
     }
     open(uri) {
         if (uri.scheme === 'command' && uri.path === 'git.clone' && !CommandsRegistry.getCommand('git.clone')) {
-            this.notificationService.info(( localize(7582, "It looks like Git is not installed on your system.")));
+            this.notificationService.info(( localize(7494, "It looks like Git is not installed on your system.")));
             return;
         }
         this.openerService.open(this.addFrom(uri), { allowCommands: true });

package/vscode/src/vs/workbench/contrib/welcomeWalkthrough/common/walkThroughContentProvider.js

@@ -3,23 +3,38 @@ import { ITextModelService } from 'vscode/vscode/vs/editor/common/services/resol
 import { IModelService } from 'vscode/vscode/vs/editor/common/services/model';
 import { DefaultEndOfLine, EndOfLinePreference } from 'vscode/vscode/vs/editor/common/model';
 import { ILanguageService } from 'vscode/vscode/vs/editor/common/languages/language';
-import marked_1 from 'vscode/external/vscode-marked/lib/marked.esm.js';
-import { FileAccess, Schemas } from 'vscode/vscode/vs/base/common/network';
+import { marked } from 'marked';
+import { Schemas } from 'vscode/vscode/vs/base/common/network';
 import { Range } from 'vscode/vscode/vs/editor/common/core/range';
 import { createTextBufferFactory } from 'vscode/vscode/vs/editor/common/model/textModel';
 import { assertIsDefined } from 'vscode/vscode/vs/base/common/types';
 import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
 
-async function requireToContent(instantiationService, resource) {
+class WalkThroughContentProviderRegistry {
+    constructor() {
+        this.providers = ( new Map());
+    }
+    registerProvider(moduleId, provider) {
+        this.providers.set(moduleId, provider);
+    }
+    getProvider(moduleId) {
+        return this.providers.get(moduleId);
+    }
+}
+const walkThroughContentRegistry = ( new WalkThroughContentProviderRegistry());
+async function moduleToContent(instantiationService, resource) {
     if (!resource.query) {
-        throw ( new Error('Welcome: invalid resource'));
+        throw ( new Error('Walkthrough: invalid resource'));
     }
     const query = JSON.parse(resource.query);
     if (!query.moduleId) {
-        throw ( new Error('Welcome: invalid resource'));
+        throw ( new Error('Walkthrough: invalid resource'));
+    }
+    const provider = walkThroughContentRegistry.getProvider(query.moduleId);
+    if (!provider) {
+        throw ( new Error(`Walkthrough: no provider registered for ${query.moduleId}`));
     }
-    const content = await FileAccess.toModuleContent(query.moduleId);
-    return instantiationService.invokeFunction(content);
+    return instantiationService.invokeFunction(provider);
 }
 let WalkThroughSnippetContentProvider = class WalkThroughSnippetContentProvider {
     static { this.ID = 'workbench.contrib.walkThroughSnippetContentProvider'; }
@@ -34,7 +49,7 @@ let WalkThroughSnippetContentProvider = class WalkThroughSnippetContentProvider
     async textBufferFactoryFromResource(resource) {
         let ongoing = this.loads.get(( resource.toString()));
         if (!ongoing) {
-            ongoing = requireToContent(this.instantiationService, resource)
+            ongoing = moduleToContent(this.instantiationService, resource)
                 .then(content => createTextBufferFactory(content))
                 .finally(() => this.loads.delete(( resource.toString())));
             this.loads.set(( resource.toString()), ongoing);
@@ -47,12 +62,12 @@ let WalkThroughSnippetContentProvider = class WalkThroughSnippetContentProvider
         if (!codeEditorModel) {
             const j = parseInt(resource.fragment);
             let i = 0;
-            const renderer = new marked_1.Renderer();
-            renderer.code = (code, lang) => {
+            const renderer = new marked.Renderer();
+            renderer.code = ({ text, lang }) => {
                 i++;
                 const languageId = typeof lang === 'string' ? this.languageService.getLanguageIdByLanguageName(lang) || '' : '';
                 const languageSelection = this.languageService.createById(languageId);
-                const model = this.modelService.createModel(code, languageSelection, resource.with({ fragment: `${i}.${lang}` }));
+                const model = this.modelService.createModel(text, languageSelection, resource.with({ fragment: `${i}.${lang}` }));
                 if (i === j) {
                     codeEditorModel = model;
                 }
@@ -62,7 +77,7 @@ let WalkThroughSnippetContentProvider = class WalkThroughSnippetContentProvider
             const lineCount = textBuffer.getLineCount();
             const range = ( new Range(1, 1, lineCount, textBuffer.getLineLength(lineCount) + 1));
             const markdown = textBuffer.getValueInRange(range, EndOfLinePreference.TextDefined);
-            marked_1(markdown, { renderer });
+            marked(markdown, { renderer });
         }
         return assertIsDefined(codeEditorModel);
     }
@@ -74,4 +89,4 @@ WalkThroughSnippetContentProvider = ( __decorate([
     ( __param(3, IInstantiationService))
 ], WalkThroughSnippetContentProvider));
 
-export { WalkThroughSnippetContentProvider, requireToContent };
+export { WalkThroughSnippetContentProvider, moduleToContent, walkThroughContentRegistry };

package/vscode/src/vs/workbench/contrib/welcomeWalkthrough/common/walkThroughUtils.js

@@ -13,6 +13,6 @@ import { localize } from 'vscode/vscode/vs/nls';
 import { Color, RGBA } from 'vscode/vscode/vs/base/common/color';
 
 registerColor('walkThrough.embeddedEditorBackground', { dark: ( (new Color( (new RGBA(0, 0, 0, .4))))), light: '#f4f4f4', hcDark: null, hcLight: null }, ( localize(
- 10614,
+ 10645,
  'Background color for the embedded editors on the Interactive Playground.'
 )));

package/walkthrough.js

@@ -5,14 +5,10 @@ import './vscode/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingS
 import './vscode/src/vs/workbench/contrib/welcomeWalkthrough/browser/walkThrough.contribution.js';
 import svgAssets from './vscode/src/vs/workbench/contrib/welcomeGettingStarted/common/media/all.svg.js';
 import pngAssets from './vscode/src/vs/workbench/contrib/welcomeGettingStarted/common/media/all.png.js';
-import { FileAccess } from 'vscode/vscode/vs/base/common/network';
 import { registerAssets } from 'vscode/assets';
 
 registerAssets(svgAssets);
 registerAssets(pngAssets);
-FileAccess.registerModuleContentProvider('vs/workbench/contrib/welcomeWalkthrough/browser/editor/vs_code_editor_walkthrough', () => import('./vscode/src/vs/workbench/contrib/welcomeWalkthrough/browser/editor/vs_code_editor_walkthrough.js').then(module => module.default ?? module));
-FileAccess.registerModuleContentProvider('vs/workbench/contrib/welcomeGettingStarted/common/media/theme_picker', () => import('./vscode/src/vs/workbench/contrib/welcomeGettingStarted/common/media/theme_picker.js').then(module => module.default ?? module));
-FileAccess.registerModuleContentProvider('vs/workbench/contrib/welcomeGettingStarted/common/media/notebookProfile', () => import('./vscode/src/vs/workbench/contrib/welcomeGettingStarted/common/media/notebookProfile.js').then(module => module.default ?? module));
 function getServiceOverride() {
     return {
         [( IWalkthroughsService.toString())]: new SyncDescriptor(WalkthroughsService, [], true)