fix(shell): do not fetch cursor position using ANSI

resolves #3434

src/engine/engine.go

@@ -16,11 +16,10 @@ var (
 )
 
 type Engine struct {
-	Config      *Config
-	Env         platform.Environment
-	Writer      *ansi.Writer
-	Plain       bool
-	PromptCount int
+	Config *Config
+	Env    platform.Environment
+	Writer *ansi.Writer
+	Plain  bool
 
 	console           strings.Builder
 	currentLineLength int
@@ -64,9 +63,13 @@ func (e *Engine) canWriteRightBlock(rprompt bool) bool {
 func (e *Engine) PrintPrimary() string {
 	// cache a pointer to the color cycle
 	cycle = &e.Config.Cycle
-	firstLine := e.Env.Getenv("POSH_CURSOR_LINE") == "1"
 	for i, block := range e.Config.Blocks {
-		e.renderBlock(block, (i == 0 && (e.PromptCount == 1 || firstLine)))
+		var cancelNewline bool
+		if i == 0 {
+			row, _ := e.Env.CursorPosition()
+			cancelNewline = e.Env.Flags().PromptCount == 1 || row == 1
+		}
+		e.renderBlock(block, cancelNewline)
 	}
 	if len(e.Config.ConsoleTitleTemplate) > 0 {
 		title := e.getTitleTemplateText()

src/engine/new.go

@@ -25,11 +25,10 @@ func New(flags *platform.Flags) *Engine {
 	ansiWriter.Init(env.Shell())
 
 	eng := &Engine{
-		Config:      cfg,
-		Env:         env,
-		Writer:      ansiWriter,
-		Plain:       flags.Plain,
-		PromptCount: env.CmdFlags.PromptCount,
+		Config: cfg,
+		Env:    env,
+		Writer: ansiWriter,
+		Plain:  flags.Plain,
 	}
 
 	return eng

src/mock/environment.go

@@ -268,3 +268,8 @@ func (env *MockedEnvironment) DirIsWritable(path string) bool {
 func (env *MockedEnvironment) SetPromptCount() {
 	_ = env.Called()
 }
+
+func (env *MockedEnvironment) CursorPosition() (int, int) {
+	args := env.Called()
+	return args.Int(0), args.Int(1)
+}

src/platform/shell.go

@@ -216,6 +216,7 @@ type Environment interface {
 	TemplateCache() *TemplateCache
 	LoadTemplateCache()
 	SetPromptCount()
+	CursorPosition() (row, col int)
 	Debug(message string)
 	Error(err error)
 	Trace(start time.Time, args ...string)
@@ -831,6 +832,16 @@ func (env *Shell) SetPromptCount() {
 	env.CmdFlags.PromptCount = count
 }
 
+func (env *Shell) CursorPosition() (row, col int) {
+	if number, err := strconv.Atoi(env.Getenv("POSH_CURSOR_LINE")); err == nil {
+		row = number
+	}
+	if number, err := strconv.Atoi(env.Getenv("POSH_CURSOR_COLUMN")); err != nil {
+		col = number
+	}
+	return
+}
+
 func IsPathSeparator(env Environment, c uint8) bool {
 	if c == '/' {
 		return true

src/shell/scripts/omp.bash

@@ -9,20 +9,6 @@ PS0='${omp_start_time:0:$((omp_start_time="$(_omp_start_timer)",0))}'
 # set secondary prompt
 PS2="$(::OMP:: print secondary --config="$POSH_THEME" --shell=bash --shell-version="$BASH_VERSION")"
 
-function _set_posh_cursor_position() {
-    # not supported in Midnight Commander
-    # see https://github.com/JanDeDobbeleer/oh-my-posh/issues/3415
-    if [[ -v MC_SID ]] || [[ $TERM_PROGRAM == "WarpTerminal" ]]; then
-        return
-    fi
-    local pos
-    echo -ne "\033[6n"            # ask the terminal for the position
-    read -s -d\[ garbage          # discard the first part of the response
-    read -s -d R pos              # store the position in bash variable 'pos'
-    export POSH_CURSOR_LINE=${pos%;*}
-    export POSH_CURSOR_COLUMN=${pos#*;}
-}
-
 function _omp_start_timer() {
     ::OMP:: get millis
 }
@@ -42,7 +28,6 @@ function _omp_hook() {
         omp_start_time=""
     fi
     set_poshcontext
-    _set_posh_cursor_position
     PS1="$(::OMP:: print primary --config="$POSH_THEME" --shell=bash --shell-version="$BASH_VERSION" --error="$ret" --execution-time="$omp_elapsed" --stack-count="$omp_stack_count" | tr -d '\0')"
     return $ret
 }

src/shell/scripts/omp.zsh

@@ -7,20 +7,6 @@ export POSH_PROMPT_COUNT=0
 # set secondary prompt
 PS2="$(::OMP:: print secondary --config="$POSH_THEME" --shell=zsh)"
 
-function _set_posh_cursor_position() {
-  # not supported in Midnight Commander
-  # see https://github.com/JanDeDobbeleer/oh-my-posh/issues/3415
-  if [[ -v MC_SID ]] || [[ $TERM_PROGRAM == "WarpTerminal" ]]; then
-      return
-  fi
-  local pos
-  echo -ne "\033[6n"            # ask the terminal for the position
-  read -s -d\[ garbage          # discard the first part of the response
-  read -s -d R pos              # store the position in bash variable 'pos'
-  export POSH_CURSOR_LINE=${pos%;*}
-  export POSH_CURSOR_COLUMN=${pos#*;}
-}
-
 # template function for context loading
 function set_poshcontext() {
   return
@@ -41,7 +27,6 @@ function prompt_ohmyposh_precmd() {
   count=$((POSH_PROMPT_COUNT+1))
   export POSH_PROMPT_COUNT=$count
   set_poshcontext
-  _set_posh_cursor_position
   eval "$(::OMP:: print primary --config="$POSH_THEME" --error="$omp_last_error" --execution-time="$omp_elapsed" --stack-count="$omp_stack_count" --eval --shell=zsh --shell-version="$ZSH_VERSION")"
   unset omp_start_time
 }

website/docs/configuration/block.mdx

@@ -86,9 +86,8 @@ Tells the engine what to do with the block. There are two options:
 
 ### Newline
 
-Start the block on a new line - defaults to `false`. For `zsh`, `bash`, `pwsh` this will not print a newline that's
-defined on the first block when the prompt is on the first line (when using clear), or when the shell session starts
-(1st prompt).
+Start the block on a new line - defaults to `false`. For `pwsh` and `cmd` this will not print a newline that's defined
+on the first block when the prompt is on the first line (when using clear), or when the shell session starts (1st prompt).
 
 ### Alignment