refactor(shell): remove powershell identifier

relates to #6806

Author: JanDeDobbeleer

src/cli/init.go

@@ -74,6 +74,10 @@ func runInit(sh, command string) {
 		log.Enable(plain)
 	}
 
+	if sh == "powershell" {
+		sh = shell.PWSH
+	}
+
 	initCache(sh)
 
 	cfg := config.Load(configFlag, false)
@@ -163,7 +167,7 @@ func getFullCommand(cmd *cobra.Command, args []string) string {
 }
 
 func initCache(sh string) {
-	if !printOutput && eval && (sh == shell.PWSH || sh == shell.PWSH5) {
+	if !printOutput && eval && sh == shell.PWSH {
 		cache.Init(sh)
 		return
 	}

src/config/config.go

@@ -120,7 +120,7 @@ func (cfg *Config) getPalette() color.Palette {
 func (cfg *Config) Features(env runtime.Environment) shell.Features {
 	var feats shell.Features
 
-	asyncShells := []string{shell.BASH, shell.ZSH, shell.FISH, shell.PWSH, shell.PWSH5}
+	asyncShells := []string{shell.BASH, shell.ZSH, shell.FISH, shell.PWSH}
 
 	if cfg.Async && slices.Contains(asyncShells, env.Shell()) {
 		log.Debug("async enabled")

src/prompt/engine.go

@@ -260,7 +260,7 @@ func (e *Engine) applyPowerShellBleedPatch() {
 	// to avoid the background being printed on the next line
 	// when at the end of the buffer.
 	// See https://github.com/JanDeDobbeleer/oh-my-posh/issues/65
-	if e.Env.Shell() != shell.PWSH && e.Env.Shell() != shell.PWSH5 {
+	if e.Env.Shell() != shell.PWSH {
 		return
 	}
 
@@ -522,7 +522,7 @@ func New(flags *runtime.Flags) *Engine {
 			diff = -2
 		}
 		eng.rectifyTerminalWidth(diff)
-	case shell.PWSH, shell.PWSH5:
+	case shell.PWSH:
 		// when in PowerShell, and force patching the bleed bug
 		// we need to reduce the terminal width by 1 so the last
 		// character isn't cut off by the ANSI escape sequences

src/prompt/extra.go

@@ -99,7 +99,7 @@ func (e *Engine) ExtraPrompt(promptType ExtraPromptType) string {
 			prompt += "\nRPROMPT=''"
 			return prompt
 		}
-	case shell.PWSH, shell.PWSH5:
+	case shell.PWSH:
 		if promptType == Transient {
 			// clear the line afterwards to prevent text from being written on the same line
 			// see https://github.com/JanDeDobbeleer/oh-my-posh/issues/3628

src/prompt/primary.go

@@ -110,7 +110,7 @@ func (e *Engine) needsPrimaryRightPrompt() bool {
 	}
 
 	switch e.Env.Shell() {
-	case shell.PWSH, shell.PWSH5, shell.GENERIC, shell.ZSH:
+	case shell.PWSH, shell.GENERIC, shell.ZSH:
 		return true
 	default:
 		return false

src/prompt/tooltip.go

@@ -48,7 +48,7 @@ func (e *Engine) Tooltip(tip string) string {
 	text, length = e.handleToolTipAction(text, length)
 
 	switch e.Env.Shell() {
-	case shell.PWSH, shell.PWSH5:
+	case shell.PWSH:
 		e.rprompt = text
 		e.currentLineLength = e.Env.Flags().Column
 

src/segments/path.go

@@ -179,7 +179,7 @@ func (pt *Path) setPaths() {
 	}
 
 	pt.pwd = pt.env.Pwd()
-	if (pt.env.Shell() == shell.PWSH || pt.env.Shell() == shell.PWSH5) && len(pt.env.Flags().PSWD) != 0 {
+	if pt.env.Shell() == shell.PWSH && len(pt.env.Flags().PSWD) != 0 {
 		pt.pwd = pt.env.Flags().PSWD
 	}
 

src/shell/constants.go

@@ -5,7 +5,6 @@ const (
 	BASH    = "bash"
 	PWSH    = "pwsh"
 	FISH    = "fish"
-	PWSH5   = "powershell"
 	CMD     = "cmd"
 	NU      = "nu"
 	GENERIC = "shell"

src/shell/dsc.go

@@ -97,7 +97,7 @@ func (s *Shell) getShellConfigPath() (string, error) {
 	case FISH:
 		configDir := filepath.Join(home, ".config", "fish")
 		return filepath.Join(configDir, "config.fish"), nil
-	case PWSH, PWSH5:
+	case PWSH:
 		return cmd.Run(s.Name, "-NoProfile", "-Command", "$PROFILE")
 	case NU:
 		return cmd.Run("nu", "-c", "$nu.config-path")
@@ -192,7 +192,7 @@ func (s *Shell) shellCommand() string {
 		return fmt.Sprintf(`eval "$(%s)"`, s.Command)
 	case FISH:
 		return s.Command + " | source"
-	case PWSH, PWSH5:
+	case PWSH:
 		return s.Command + " | Invoke-Expression"
 	case ELVISH:
 		return fmt.Sprintf(`eval (%s)`, s.Command)

src/shell/dsc_test.go

@@ -397,14 +397,6 @@ func TestShellCommand(t *testing.T) {
 			},
 			expected: "oh-my-posh init pwsh | Invoke-Expression",
 		},
-		{
-			name: "powershell shell command",
-			shell: &Shell{
-				Name:    "powershell",
-				Command: "oh-my-posh init powershell",
-			},
-			expected: "oh-my-posh init powershell | Invoke-Expression",
-		},
 		{
 			name: "elvish shell command",
 			shell: &Shell{