fix: Block cursor be on inlay hint

src/vs/editor/common/cursor/oneCursor.ts

@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { CursorState, ICursorSimpleModel, SelectionStartKind, SingleCursorState } from '../cursorCommon.js';
+import { CursorConfiguration, CursorState, ICursorSimpleModel, SelectionStartKind, SingleCursorState } from '../cursorCommon.js';
 import { CursorContext } from './cursorContext.js';
 import { Position } from '../core/position.js';
 import { Range } from '../core/range.js';
@@ -88,12 +88,12 @@ export class Cursor {
 		return viewModel.normalizePosition(position, PositionAffinity.None);
 	}
 
-	private static _validateViewState(viewModel: ICursorSimpleModel, viewState: SingleCursorState): SingleCursorState {
+	private static _validateViewState(viewModel: ICursorSimpleModel, viewState: SingleCursorState, cursorConfig: CursorConfiguration): SingleCursorState {
 		const position = viewState.position;
 		const sStartPosition = viewState.selectionStart.getStartPosition();
 		const sEndPosition = viewState.selectionStart.getEndPosition();
 
-		const validPosition = viewModel.normalizePosition(position, PositionAffinity.None);
+		const validPosition = viewModel.normalizePosition(position, cursorConfig.cursorStyleKind === 'onCharacter' ? PositionAffinity.RightOfInjectedTextBlockCursor : PositionAffinity.None);
 		const validSStartPosition = this._validatePositionWithCache(viewModel, sStartPosition, position, validPosition);
 		const validSEndPosition = this._validatePositionWithCache(viewModel, sEndPosition, sStartPosition, validSStartPosition);
 
@@ -113,7 +113,7 @@ export class Cursor {
 
 	private _setState(context: CursorContext, modelState: SingleCursorState | null, viewState: SingleCursorState | null): void {
 		if (viewState) {
-			viewState = Cursor._validateViewState(context.viewModel, viewState);
+			viewState = Cursor._validateViewState(context.viewModel, viewState, context.cursorConfig);
 		}
 
 		if (!modelState) {

src/vs/editor/common/cursorCommon.ts

@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { ConfigurationChangedEvent, EditorAutoClosingEditStrategy, EditorAutoClosingStrategy, EditorAutoIndentStrategy, EditorAutoSurroundStrategy, EditorOption } from './config/editorOptions.js';
+import { ConfigurationChangedEvent, EditorAutoClosingEditStrategy, EditorAutoClosingStrategy, EditorAutoIndentStrategy, EditorAutoSurroundStrategy, EditorOption, TextEditorCursorStyle } from './config/editorOptions.js';
 import { LineTokens } from './tokens/lineTokens.js';
 import { Position } from './core/position.js';
 import { Range } from './core/range.js';
@@ -83,6 +83,21 @@ export class CursorConfiguration {
 	private readonly _languageId: string;
 	private _electricChars: { [key: string]: boolean } | null;
 
+	public readonly cursorStyle: TextEditorCursorStyle;
+
+	public get cursorStyleKind(): 'beforeCharacter' | 'onCharacter' {
+		switch (this.cursorStyle) {
+			case TextEditorCursorStyle.Line:
+			case TextEditorCursorStyle.LineThin:
+				return 'beforeCharacter';
+			case TextEditorCursorStyle.Block:
+			case TextEditorCursorStyle.Underline:
+			case TextEditorCursorStyle.BlockOutline:
+			case TextEditorCursorStyle.UnderlineThin:
+				return 'onCharacter';
+		}
+	}
+
 	public static shouldRecreate(e: ConfigurationChangedEvent): boolean {
 		return (
 			e.hasChanged(EditorOption.layoutInfo)
@@ -102,6 +117,7 @@ export class CursorConfiguration {
 			|| e.hasChanged(EditorOption.readOnly)
 			|| e.hasChanged(EditorOption.wordSegmenterLocales)
 			|| e.hasChanged(EditorOption.overtypeOnPaste)
+      || e.hasChanged(EditorOption.cursorStyle)
 		);
 	}
 
@@ -145,6 +161,8 @@ export class CursorConfiguration {
 		this.surroundingPairs = {};
 		this._electricChars = null;
 
+		this.cursorStyle = options.get(EditorOption.cursorStyle);
+
 		this.shouldAutoCloseBefore = {
 			quote: this._getShouldAutoClose(languageId, this.autoClosingQuotes, true),
 			comment: this._getShouldAutoClose(languageId, this.autoClosingComments, false),

src/vs/editor/common/model.ts

@@ -320,6 +320,7 @@ export enum InjectedTextCursorStops {
 	Both,
 	Right,
 	Left,
+	LeftIfNonBlockCursor,
 	None
 }
 
@@ -1373,6 +1374,11 @@ export const enum PositionAffinity {
 	 * If the given position is on injected text, prefers the position right of it.
 	*/
 	RightOfInjectedText = 4,
+
+	/**
+	 * If the given position is on injected text while the cursor is block cursor, prefers the position right of it.
+	*/
+	RightOfInjectedTextBlockCursor = 5,
 }
 
 /**

src/vs/editor/common/modelLineProjectionData.ts

@@ -229,7 +229,7 @@ export class ModelLineProjectionData {
 
 				return result;
 			}
-		} else if (affinity === PositionAffinity.Right || affinity === PositionAffinity.RightOfInjectedText) {
+		} else if (affinity === PositionAffinity.Right || affinity === PositionAffinity.RightOfInjectedText || affinity === PositionAffinity.RightOfInjectedTextBlockCursor) {
 			let result = injectedText.offsetInInputWithInjections + injectedText.length;
 			let index = injectedText.injectedTextIndex;
 			// traverse all injected text that touch each other

src/vs/editor/common/standalone/standaloneEnums.ts

@@ -411,7 +411,8 @@ export enum InjectedTextCursorStops {
 	Both = 0,
 	Right = 1,
 	Left = 2,
-	None = 3
+	LeftIfNonBlockCursor = 3,
+	None = 4
 }
 
 export enum InlayHintKind {
@@ -800,7 +801,11 @@ export enum PositionAffinity {
 	/**
 	 * If the given position is on injected text, prefers the position right of it.
 	*/
-	RightOfInjectedText = 4
+	RightOfInjectedText = 4,
+	/**
+	 * If the given position is on injected text while the cursor is block cursor, prefers the position right of it.
+	*/
+	RightOfInjectedTextBlockCursor = 5
 }
 
 export enum RenderLineNumbersType {

src/vs/monaco.d.ts

@@ -1823,7 +1823,8 @@ declare namespace monaco.editor {
 		Both = 0,
 		Right = 1,
 		Left = 2,
-		None = 3
+		LeftIfNonBlockCursor = 3,
+		None = 4
 	}
 
 	/**
@@ -2388,7 +2389,11 @@ declare namespace monaco.editor {
 		/**
 		 * If the given position is on injected text, prefers the position right of it.
 		*/
-		RightOfInjectedText = 4
+		RightOfInjectedText = 4,
+		/**
+		 * If the given position is on injected text while the cursor is block cursor, prefers the position right of it.
+		*/
+		RightOfInjectedTextBlockCursor = 5
 	}
 
 	/**