@codingame/monaco-vscode-walkthrough-service-override 20.5.0 → 21.0.1

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

@@ -9,15 +9,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(12554, "Default")))}
+		${escape(( localize(12752, "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(12555, "Jupyter")))}
+		${escape(( localize(12753, "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(12556, "Colab")))}
+		${escape(( localize(12754, "Colab")))}
 	</checkbox>
 </checklist>
 </vertically-centered>

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

@@ -8,26 +8,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(12557, "Dark Modern")))}
+			${escape(( localize(12755, "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(12558, "Light Modern")))}
+			${escape(( localize(12756, "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(12559, "Dark High Contrast")))}
+			${escape(( localize(12757, "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(12560, "Light High Contrast")))}
+			${escape(( localize(12758, "Light High Contrast")))}
 		</checkbox>
 	</div>
 </checklist>
 <checkbox class="theme-picker-link" when-checked="command:workbench.action.selectTheme" checked-on="false">
-	${escape(( localize(12561, "See More Themes...")))}
+	${escape(( localize(12759, "See More Themes...")))}
 </checkbox>
 `;
 

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

@@ -8,21 +8,21 @@ var themePickerSmallContent = () => `
 	<div class="theme-picker-row">
 		<checkbox when-checked="setTheme:${ThemeSettingDefaults.COLOR_THEME_DARK}" checked-on="config.workbench.colorTheme == '${ThemeSettingDefaults.COLOR_THEME_DARK}'">
 			<img width="150" src="./dark.png"/>
-			${escape(( localize(12562, "Dark Modern")))}
+			${escape(( localize(12760, "Dark Modern")))}
 		</checkbox>
 		<checkbox when-checked="setTheme:${ThemeSettingDefaults.COLOR_THEME_LIGHT}" checked-on="config.workbench.colorTheme == '${ThemeSettingDefaults.COLOR_THEME_LIGHT}'">
 			<img width="150" src="./light.png"/>
-			${escape(( localize(12563, "Light Modern")))}
+			${escape(( localize(12761, "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="150" src="./dark-hc.png"/>
-			${escape(( localize(12564, "Dark High Contrast")))}
+			${escape(( localize(12762, "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="150" src="./light-hc.png"/>
-			${escape(( localize(12565, "Light High Contrast")))}
+			${escape(( localize(12763, "Light High Contrast")))}
 		</checkbox>
 	</div>
 </checklist>

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

@@ -13,7 +13,7 @@ walkThroughContentRegistry.registerProvider('vs/workbench/contrib/welcomeWalkthr
 const typeId = 'workbench.editors.walkThroughInput';
 const inputOptions = {
     typeId,
-    name: ( localize(12584, "Editor Playground")),
+    name: ( localize(12782, "Editor Playground")),
     resource: ( FileAccess.asBrowserUri(
         'vs/workbench/contrib/welcomeWalkthrough/browser/editor/vs_code_editor_walkthrough.md'
     ))
@@ -25,7 +25,7 @@ const inputOptions = {
 };
 class EditorWalkThroughAction extends Action2 {
     static { this.ID = 'workbench.action.showInteractivePlayground'; }
-    static { this.LABEL = ( localize2(12585, 'Interactive Editor Playground')); }
+    static { this.LABEL = ( localize2(12783, 'Interactive Editor Playground')); }
     constructor() {
         super({
             id: EditorWalkThroughAction.ID,
@@ -33,7 +33,7 @@ class EditorWalkThroughAction extends Action2 {
             category: Categories.Help,
             f1: true,
             metadata: {
-                description: ( localize2(12586, "Opens an interactive playground for learning about the editor."))
+                description: ( localize2(12784, "Opens an interactive playground for learning about the editor."))
             }
         });
     }

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

@@ -10,11 +10,11 @@ import { EditorExtensions } from '@codingame/monaco-vscode-api/vscode/vs/workben
 import { SyncDescriptor } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/descriptors';
 import { registerAction2, MenuRegistry, MenuId } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/common/actions';
 import { registerWorkbenchContribution2 } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/contributions';
-import { EditorPaneDescriptor } from '@codingame/monaco-vscode-60014c9d-b815-501d-83a9-4b08725c2ec2-common/vscode/vs/workbench/browser/editor';
+import { EditorPaneDescriptor } from '@codingame/monaco-vscode-5e2c24a1-3217-55e8-bc90-521eaf7df5a6-common/vscode/vs/workbench/browser/editor';
 import { KeybindingsRegistry } from '@codingame/monaco-vscode-api/vscode/vs/platform/keybinding/common/keybindingsRegistry';
 
 ( Registry.as(EditorExtensions.EditorPane))
-    .registerEditorPane(EditorPaneDescriptor.create(WalkThroughPart, WalkThroughPart.ID, ( localize(12587, "Playground"))), [( new SyncDescriptor(WalkThroughInput))]);
+    .registerEditorPane(EditorPaneDescriptor.create(WalkThroughPart, WalkThroughPart.ID, ( localize(12785, "Playground"))), [( new SyncDescriptor(WalkThroughInput))]);
 registerAction2(EditorWalkThroughAction);
 ( Registry.as(EditorExtensions.EditorFactory)).registerEditorSerializer(EditorWalkThroughInputSerializer.ID, EditorWalkThroughInputSerializer);
 registerWorkbenchContribution2(WalkThroughSnippetContentProvider.ID, WalkThroughSnippetContentProvider, { editorTypeId: WalkThroughPart.ID });
@@ -26,7 +26,7 @@ MenuRegistry.appendMenuItem(MenuId.MenubarHelpMenu, {
     group: '1_welcome',
     command: {
         id: 'workbench.action.showInteractivePlayground',
-        title: ( localize(12588, "Editor Playgrou&&nd"))
+        title: ( localize(12786, "Editor Playgrou&&nd"))
     },
     order: 3
 });

package/vscode/src/vs/workbench/contrib/welcomeWalkthrough/browser/walkThroughPart.d.ts

@@ -1,5 +1,5 @@
 import { IEditorOpenContext } from "@codingame/monaco-vscode-api/vscode/vs/workbench/common/editor";
-import { EditorPane } from "@codingame/monaco-vscode-60014c9d-b815-501d-83a9-4b08725c2ec2-common/vscode/vs/workbench/browser/parts/editor/editorPane";
+import { EditorPane } from "@codingame/monaco-vscode-5e2c24a1-3217-55e8-bc90-521eaf7df5a6-common/vscode/vs/workbench/browser/parts/editor/editorPane";
 import { ITelemetryService } from "@codingame/monaco-vscode-api/vscode/vs/platform/telemetry/common/telemetry.service";
 import { WalkThroughInput } from "./walkThroughInput.js";
 import { IOpenerService } from "@codingame/monaco-vscode-api/vscode/vs/platform/opener/common/opener.service";

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

@@ -9,7 +9,7 @@ import { ScrollbarVisibility } from '@codingame/monaco-vscode-api/vscode/vs/base
 import { escape } from '@codingame/monaco-vscode-api/vscode/vs/base/common/strings';
 import { URI } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uri';
 import { DisposableStore, toDisposable, dispose } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
-import { EditorPane } from '@codingame/monaco-vscode-60014c9d-b815-501d-83a9-4b08725c2ec2-common/vscode/vs/workbench/browser/parts/editor/editorPane';
+import { EditorPane } from '@codingame/monaco-vscode-5e2c24a1-3217-55e8-bc90-521eaf7df5a6-common/vscode/vs/workbench/browser/parts/editor/editorPane';
 import { ITelemetryService } from '@codingame/monaco-vscode-api/vscode/vs/platform/telemetry/common/telemetry.service';
 import { WalkThroughInput } from './walkThroughInput.js';
 import { IOpenerService } from '@codingame/monaco-vscode-api/vscode/vs/platform/opener/common/opener.service';
@@ -38,7 +38,7 @@ import { IExtensionService } from '@codingame/monaco-vscode-api/vscode/vs/workbe
 var WalkThroughPart_1;
 registerCss(walkThroughPart);
 const WALK_THROUGH_FOCUS = ( new RawContextKey('interactivePlaygroundFocus', false));
-const UNBOUND_COMMAND = ( localize(12589, "unbound"));
+const UNBOUND_COMMAND = ( localize(12787, "unbound"));
 const WALK_THROUGH_EDITOR_VIEW_STATE_PREFERENCE_KEY = 'walkThroughEditorViewState';
 let WalkThroughPart = class WalkThroughPart extends EditorPane {
     static { WalkThroughPart_1 = this; }
@@ -148,7 +148,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(12590, "It looks like Git is not installed on your system.")));
+            this.notificationService.info(( localize(12788, "It looks like Git is not installed on your system.")));
             return;
         }
         this.openerService.open(this.addFrom(uri), { allowCommands: true });
@@ -268,7 +268,8 @@ let WalkThroughPart = class WalkThroughPart extends EditorPane {
                 editor.setModel(model);
                 this.contentDisposables.push(editor);
                 const updateHeight = (initial) => {
-                    const lineHeight = editor.getOption(EditorOption.lineHeight);
+                    const position = editor.getPosition();
+                    const lineHeight = position ? editor.getLineHeightForPosition(position) : editor.getOption(EditorOption.lineHeight);
                     const height = `${Math.max(model.getLineCount() + 1, 4) * lineHeight}px`;
                     if (div.style.height !== height) {
                         div.style.height = height;
@@ -285,7 +286,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.getLineHeightForPosition(e.position);
                         const lineTop = (targetTop + (e.position.lineNumber - 1) * lineHeight) - containerTop;
                         const lineBottom = lineTop + lineHeight;
                         const scrollDimensions = this.scrollbar.getScrollDimensions();

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

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