@codingame/monaco-vscode-walkthrough-service-override 9.0.2 → 10.0.0

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

@@ -8,15 +8,15 @@ var notebookProfileContent = () => `
 <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(10647, "Default")))}
+		${escape(( localize(10747, "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(10648, "Jupyter")))}
+		${escape(( localize(10748, "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(10649, "Colab")))}
+		${escape(( localize(10749, "Colab")))}
 	</checkbox>
 </checklist>
 </vertically-centered>

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

@@ -7,26 +7,26 @@ var themePickerContent = () => `
 	<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(10642, "Dark Modern")))}
+			${escape(( localize(10742, "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(10643, "Light Modern")))}
+			${escape(( localize(10743, "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(10644, "Dark High Contrast")))}
+			${escape(( localize(10744, "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(10645, "Light High Contrast")))}
+			${escape(( localize(10745, "Light High Contrast")))}
 		</checkbox>
 	</div>
 </checklist>
 <checkbox class="theme-picker-link" when-checked="command:workbench.action.selectTheme" checked-on="false">
-	${escape(( localize(10646, "See More Themes...")))}
+	${escape(( localize(10746, "See More Themes...")))}
 </checkbox>
 `;
 

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

@@ -12,7 +12,7 @@ walkThroughContentRegistry.registerProvider('vs/workbench/contrib/welcomeWalkthr
 const typeId = 'workbench.editors.walkThroughInput';
 const inputOptions = {
     typeId,
-    name: ( localize(7531, "Editor Playground")),
+    name: ( localize(7542, "Editor Playground")),
     resource: ( (FileAccess.asBrowserUri(
         'vs/workbench/contrib/welcomeWalkthrough/browser/editor/vs_code_editor_walkthrough.md'
     )))
@@ -24,7 +24,7 @@ const inputOptions = {
 };
 class EditorWalkThroughAction extends Action2 {
     static { this.ID = 'workbench.action.showInteractivePlayground'; }
-    static { this.LABEL = ( localize2(7532, 'Interactive Editor Playground')); }
+    static { this.LABEL = ( localize2(7543, 'Interactive Editor Playground')); }
     constructor() {
         super({
             id: EditorWalkThroughAction.ID,
@@ -32,7 +32,7 @@ class EditorWalkThroughAction extends Action2 {
             category: Categories.Help,
             f1: true,
             metadata: {
-                description: ( localize2(7533, "Opens an interactive playground for learning about the editor."))
+                description: ( localize2(7544, "Opens an interactive playground for learning about the editor."))
             }
         });
     }

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

@@ -5,7 +5,7 @@ function content(accessor) {
     const isServerless = isWeb && !accessor.get(IWorkbenchEnvironmentService).remoteAuthority;
     return `
 ## Interactive Editor Playground
-The core editor in VS Code is packed with features.  This page highlights a number of them and lets you interactively try them out through the use of a number of embedded editors.  For full details on the editor features for VS Code and more head over to our [documentation](command:workbench.action.openDocumentationUrl).
+The core editor in VS Code is packed with features.  This page highlights a number of them and lets you interactively try them out through the use of a number of embedded editors.  For full details on the editor features for VS Code and more head over to our [documentation](https://code.visualstudio.com/docs).
 
 * [Multi-cursor Editing](#multi-cursor-editing) - block selection, select all occurrences, add additional cursors and more.
 * [IntelliSense](#intellisense) - get code assistance and parameter suggestions for your code and external modules.

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(3149, "Playground"))), [( (new SyncDescriptor(WalkThroughInput)))]);
+    .registerEditorPane(EditorPaneDescriptor.create(WalkThroughPart, WalkThroughPart.ID, ( localize(3165, "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(3150, "Editor Playgrou&&nd"))
+        title: ( localize(3166, "Editor Playgrou&&nd"))
     },
     order: 3
 });

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

@@ -1,15 +1,13 @@
 import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService.service';
 import { WALK_THROUGH_FOCUS, WalkThroughPart } from './walkThroughPart.js';
-import { KeybindingWeight } from 'vscode/vscode/vs/platform/keybinding/common/keybindingsRegistry';
 import { EditorContextKeys } from 'vscode/vscode/vs/editor/common/editorContextKeys';
 import { ContextKeyExpr } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
-import { KeyCode } from 'vscode/vscode/vs/base/common/keyCodes';
 
 const WalkThroughArrowUp = {
     id: 'workbench.action.interactivePlayground.arrowUp',
-    weight: KeybindingWeight.WorkbenchContrib,
+    weight: 200 ,
     when: ( ContextKeyExpr.and(WALK_THROUGH_FOCUS, ( EditorContextKeys.editorTextFocus.toNegated()))),
-    primary: KeyCode.UpArrow,
+    primary: 16 ,
     handler: accessor => {
         const editorService = accessor.get(IEditorService);
         const activeEditorPane = editorService.activeEditorPane;
@@ -20,9 +18,9 @@ const WalkThroughArrowUp = {
 };
 const WalkThroughArrowDown = {
     id: 'workbench.action.interactivePlayground.arrowDown',
-    weight: KeybindingWeight.WorkbenchContrib,
+    weight: 200 ,
     when: ( ContextKeyExpr.and(WALK_THROUGH_FOCUS, ( EditorContextKeys.editorTextFocus.toNegated()))),
-    primary: KeyCode.DownArrow,
+    primary: 18 ,
     handler: accessor => {
         const editorService = accessor.get(IEditorService);
         const activeEditorPane = editorService.activeEditorPane;
@@ -33,9 +31,9 @@ const WalkThroughArrowDown = {
 };
 const WalkThroughPageUp = {
     id: 'workbench.action.interactivePlayground.pageUp',
-    weight: KeybindingWeight.WorkbenchContrib,
+    weight: 200 ,
     when: ( ContextKeyExpr.and(WALK_THROUGH_FOCUS, ( EditorContextKeys.editorTextFocus.toNegated()))),
-    primary: KeyCode.PageUp,
+    primary: 11 ,
     handler: accessor => {
         const editorService = accessor.get(IEditorService);
         const activeEditorPane = editorService.activeEditorPane;
@@ -46,9 +44,9 @@ const WalkThroughPageUp = {
 };
 const WalkThroughPageDown = {
     id: 'workbench.action.interactivePlayground.pageDown',
-    weight: KeybindingWeight.WorkbenchContrib,
+    weight: 200 ,
     when: ( ContextKeyExpr.and(WALK_THROUGH_FOCUS, ( EditorContextKeys.editorTextFocus.toNegated()))),
-    primary: KeyCode.PageDown,
+    primary: 12 ,
     handler: accessor => {
         const editorService = accessor.get(IEditorService);
         const activeEditorPane = editorService.activeEditorPane;

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

@@ -1,13 +1,13 @@
 import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
+import { marked, Marked } from 'marked';
+import { Schemas } from 'vscode/vscode/vs/base/common/network';
+import { isEqual } from 'vscode/vscode/vs/base/common/resources';
+import { ITextModelService } from 'vscode/vscode/vs/editor/common/services/resolverService';
+import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
 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 } from 'marked';
-import { isEqual } from 'vscode/vscode/vs/base/common/resources';
+import { markedGfmHeadingIdPlugin } from 'vscode/vscode/vs/workbench/contrib/markdown/browser/markedGfmHeadingIdPlugin';
 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';
 
 var WalkThroughInput_1;
 class WalkThroughModel extends EditorModel {
@@ -29,7 +29,7 @@ class WalkThroughModel extends EditorModel {
 }
 let WalkThroughInput = WalkThroughInput_1 = class WalkThroughInput extends EditorInput {
     get capabilities() {
-        return EditorInputCapabilities.Singleton | super.capabilities;
+        return 8  | super.capabilities;
     }
     get resource() { return this.options.resource; }
     constructor(options, instantiationService, textModelResolverService) {
@@ -80,7 +80,8 @@ let WalkThroughInput = WalkThroughInput_1 = class WalkThroughInput extends Edito
                     snippets.push(this.textModelResolverService.createModelReference(resource));
                     return `<div id="snippet-${resource.fragment}" class="walkThroughEditorContainer" ></div>`;
                 };
-                content = marked(content, { async: false, renderer });
+                const m = new Marked({ renderer }, markedGfmHeadingIdPlugin());
+                content = m.parse(content, { async: false });
                 return Promise.all(snippets)
                     .then(refs => ( new WalkThroughModel(content, refs)));
             });

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

@@ -3,7 +3,6 @@ import '../common/walkThroughUtils.js';
 import './media/walkThroughPart.css.js';
 import { DomScrollableElement } from 'vscode/vscode/vs/base/browser/ui/scrollbar/scrollableElement';
 import { Gesture, EventType } from 'vscode/vscode/vs/base/browser/touch';
-import { ScrollbarVisibility } from 'vscode/vscode/vs/base/common/scrollable';
 import { escape } from 'vscode/vscode/vs/base/common/strings';
 import { URI } from 'vscode/vscode/vs/base/common/uri';
 import { DisposableStore, toDisposable, dispose } from 'vscode/vscode/vs/base/common/lifecycle';
@@ -22,10 +21,9 @@ import { IContextKeyService } from 'vscode/vscode/vs/platform/contextkey/common/
 import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration.service';
 import { isObject } from 'vscode/vscode/vs/base/common/types';
 import { CommandsRegistry } from 'vscode/vscode/vs/platform/commands/common/commands';
-import { EditorOption } from 'vscode/vscode/vs/editor/common/config/editorOptions';
 import { IThemeService } from 'vscode/vscode/vs/platform/theme/common/themeService.service';
 import { UILabelProvider } from 'vscode/vscode/vs/base/common/keybindingLabels';
-import { OS, OperatingSystem } from 'vscode/vscode/vs/base/common/platform';
+import { OS } from 'vscode/vscode/vs/base/common/platform';
 import { deepClone } from 'vscode/vscode/vs/base/common/objects';
 import { INotificationService } from 'vscode/vscode/vs/platform/notification/common/notification.service';
 import { isHTMLElement, isHTMLAnchorElement, isHTMLButtonElement, size, safeInnerHtml, addDisposableListener } from 'vscode/vscode/vs/base/browser/dom';
@@ -34,7 +32,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(7529, "unbound"));
+const UNBOUND_COMMAND = ( localize(7540, "unbound"));
 const WALK_THROUGH_EDITOR_VIEW_STATE_PREFERENCE_KEY = 'walkThroughEditorViewState';
 let WalkThroughPart = class WalkThroughPart extends EditorPane {
     static { WalkThroughPart_1 = this; }
@@ -59,8 +57,8 @@ let WalkThroughPart = class WalkThroughPart extends EditorPane {
         this.content.tabIndex = 0;
         this.content.style.outlineStyle = 'none';
         this.scrollbar = ( (new DomScrollableElement(this.content, {
-            horizontal: ScrollbarVisibility.Auto,
-            vertical: ScrollbarVisibility.Auto
+            horizontal: 1 ,
+            vertical: 1
         })));
         this.disposables.add(this.scrollbar);
         container.appendChild(this.scrollbar.getDomNode());
@@ -144,7 +142,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(7530, "It looks like Git is not installed on your system.")));
+            this.notificationService.info(( localize(7541, "It looks like Git is not installed on your system.")));
             return;
         }
         this.openerService.open(this.addFrom(uri), { allowCommands: true });
@@ -231,7 +229,7 @@ let WalkThroughPart = class WalkThroughPart extends EditorPane {
             }
             const content = model.main;
             if (!input.resource.path.endsWith('.md')) {
-                safeInnerHtml(this.content, content);
+                safeInnerHtml(this.content, content, { ALLOW_UNKNOWN_PROTOCOLS: true });
                 this.updateSizeClasses();
                 this.decorateContent();
                 this.contentDisposables.push(this.keybindingService.onDidUpdateKeybindings(() => this.decorateContent()));
@@ -244,7 +242,7 @@ let WalkThroughPart = class WalkThroughPart extends EditorPane {
             const innerContent = document.createElement('div');
             innerContent.classList.add('walkThroughContent');
             const markdown = this.expandMacros(content);
-            safeInnerHtml(innerContent, markdown);
+            safeInnerHtml(innerContent, markdown, { ALLOW_UNKNOWN_PROTOCOLS: true });
             this.content.appendChild(innerContent);
             model.snippets.forEach((snippet, i) => {
                 const model = snippet.textEditorModel;
@@ -264,7 +262,7 @@ let WalkThroughPart = class WalkThroughPart extends EditorPane {
                 editor.setModel(model);
                 this.contentDisposables.push(editor);
                 const updateHeight = (initial) => {
-                    const lineHeight = editor.getOption(EditorOption.lineHeight);
+                    const lineHeight = editor.getOption(69 );
                     const height = `${Math.max(model.getLineCount() + 1, 4) * lineHeight}px`;
                     if (div.style.height !== height) {
                         div.style.height = height;
@@ -281,7 +279,7 @@ let WalkThroughPart = class WalkThroughPart extends EditorPane {
                     if (innerContent) {
                         const targetTop = div.getBoundingClientRect().top;
                         const containerTop = innerContent.getBoundingClientRect().top;
-                        const lineHeight = editor.getOption(EditorOption.lineHeight);
+                        const lineHeight = editor.getOption(69 );
                         const lineTop = (targetTop + (e.position.lineNumber - 1) * lineHeight) - containerTop;
                         const lineBottom = lineTop + lineHeight;
                         const scrollDimensions = this.scrollbar.getScrollDimensions();
@@ -364,7 +362,7 @@ let WalkThroughPart = class WalkThroughPart extends EditorPane {
     multiCursorModifier() {
         const labels = UILabelProvider.modifierLabels[OS];
         const value = this.configurationService.getValue('editor.multiCursorModifier');
-        const modifier = labels[value === 'ctrlCmd' ? (OS === OperatingSystem.Macintosh ? 'metaKey' : 'ctrlKey') : 'altKey'];
+        const modifier = labels[value === 'ctrlCmd' ? (OS === 2  ? 'metaKey' : 'ctrlKey') : 'altKey'];
         const keys = this.content.querySelectorAll('.multi-cursor-modifier');
         Array.prototype.forEach.call(keys, (key) => {
             while (key.firstChild) {

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

@@ -1,7 +1,6 @@
 import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
 import { ITextModelService } from 'vscode/vscode/vs/editor/common/services/resolverService';
 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 } from 'marked';
 import { Schemas } from 'vscode/vscode/vs/base/common/network';
@@ -73,10 +72,10 @@ let WalkThroughSnippetContentProvider = class WalkThroughSnippetContentProvider
                 }
                 return '';
             };
-            const textBuffer = factory.create(DefaultEndOfLine.LF).textBuffer;
+            const textBuffer = factory.create(1 ).textBuffer;
             const lineCount = textBuffer.getLineCount();
             const range = ( new Range(1, 1, lineCount, textBuffer.getLineLength(lineCount) + 1));
-            const markdown = textBuffer.getValueInRange(range, EndOfLinePreference.TextDefined);
+            const markdown = textBuffer.getValueInRange(range, 0 );
             marked(markdown, { renderer });
         }
         return assertIsDefined(codeEditorModel);

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(
- 10657,
+ 10750,
  'Background color for the embedded editors on the Interactive Playground.'
 )));