mudhorn/oh-my-posh
1
0
Fork 0
mirror of https://github.com/JanDeDobbeleer/oh-my-posh.git synced 2025-03-05 20:49:04 -08:00
Code Issues Actions Packages Projects Releases Wiki Activity

feat(osc): remove OSC99 from config

Browse source 
BREAKING CHANGE: this requires to set `pwd: OSC99` instead of `OSC99: true`
This commit is contained in:
Jan De Dobbeleer 2024-08-05 20:34:08 +02:00 committed by Jan De Dobbeleer
parent d4b86e63e4
commit 0c6ab9beac
5 changed files with 2 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/cli/config_export_image.go
View file

@ -64,7 +64,6 @@ Exports the config to an image file using customized output options.`,
// set sane defaults for things we don't print // set sane defaults for things we don't print
cfg.ConsoleTitleTemplate = "" cfg.ConsoleTitleTemplate = ""
cfg.PWD = "" cfg.PWD = ""
cfg.OSC99 = false
// add variables to the environment // add variables to the environment
env.Var = cfg.Var env.Var = cfg.Var

1
src/config/config.go
View file

@ -44,7 +44,6 @@ type Config struct {
Version int `json:"version" toml:"version"` Version int `json:"version" toml:"version"`
DisableNotice bool `json:"disable_notice,omitempty" toml:"disable_notice,omitempty"` DisableNotice bool `json:"disable_notice,omitempty" toml:"disable_notice,omitempty"`
AutoUpgrade bool `json:"auto_upgrade,omitempty" toml:"auto_upgrade,omitempty"` AutoUpgrade bool `json:"auto_upgrade,omitempty" toml:"auto_upgrade,omitempty"`
OSC99 bool `json:"osc99,omitempty" toml:"osc99,omitempty"`
ShellIntegration bool `json:"shell_integration,omitempty" toml:"shell_integration,omitempty"` ShellIntegration bool `json:"shell_integration,omitempty" toml:"shell_integration,omitempty"`
MigrateGlyphs bool `json:"-" toml:"-"` MigrateGlyphs bool `json:"-" toml:"-"`
PatchPwshBleed bool `json:"patch_pwsh_bleed,omitempty" toml:"patch_pwsh_bleed,omitempty"` PatchPwshBleed bool `json:"patch_pwsh_bleed,omitempty" toml:"patch_pwsh_bleed,omitempty"`

8
src/prompt/engine.go
View file

@ -68,7 +68,7 @@ func (e *Engine) canWriteRightBlock(length int, rprompt bool) (int, bool) {
func (e *Engine) pwd() { func (e *Engine) pwd() {
// only print when relevant // only print when relevant
if len(e.Config.PWD) == 0 && !e.Config.OSC99 { if len(e.Config.PWD) == 0 {
return return
} }
@ -83,12 +83,6 @@ func (e *Engine) pwd() {
pwd = strings.ReplaceAll(pwd, `\`, `/`) pwd = strings.ReplaceAll(pwd, `\`, `/`)
} }
// Backwards compatibility for deprecated OSC99
if e.Config.OSC99 {
e.write(terminal.Pwd(terminal.OSC99, "", "", pwd))
return
}
// Allow template logic to define when to enable the PWD (when supported) // Allow template logic to define when to enable the PWD (when supported)
tmpl := &template.Text{ tmpl := &template.Text{
Template: e.Config.PWD, Template: e.Config.PWD,

3
src/prompt/engine_test.go
View file

@ -56,14 +56,12 @@ func TestPrintPWD(t *testing.T) {
Pwd string Pwd string
Shell string Shell string
Cygwin bool Cygwin bool
OSC99 bool
}{ }{
{Case: "Empty PWD"}, {Case: "Empty PWD"},
{Case: "OSC99", Config: terminal.OSC99, Expected: "\x1b]9;9;pwd\x1b\\"}, {Case: "OSC99", Config: terminal.OSC99, Expected: "\x1b]9;9;pwd\x1b\\"},
{Case: "OSC99 - Elvish", Config: terminal.OSC99, Shell: shell.ELVISH}, {Case: "OSC99 - Elvish", Config: terminal.OSC99, Shell: shell.ELVISH},
{Case: "OSC7", Config: terminal.OSC7, Expected: "\x1b]7;file://host/pwd\x1b\\"}, {Case: "OSC7", Config: terminal.OSC7, Expected: "\x1b]7;file://host/pwd\x1b\\"},
{Case: "OSC51", Config: terminal.OSC51, Expected: "\x1b]51;Auser@host:pwd\x1b\\"}, {Case: "OSC51", Config: terminal.OSC51, Expected: "\x1b]51;Auser@host:pwd\x1b\\"},
{Case: "Deprecated OSC99", OSC99: true, Expected: "\x1b]9;9;pwd\x1b\\"},
{Case: "Template (empty)", Config: "{{ if eq .Shell \"pwsh\" }}osc7{{ end }}"}, {Case: "Template (empty)", Config: "{{ if eq .Shell \"pwsh\" }}osc7{{ end }}"},
{Case: "Template (non empty)", Config: "{{ if eq .Shell \"shell\" }}osc7{{ end }}", Expected: "\x1b]7;file://host/pwd\x1b\\"}, {Case: "Template (non empty)", Config: "{{ if eq .Shell \"shell\" }}osc7{{ end }}", Expected: "\x1b]7;file://host/pwd\x1b\\"},
{ {
@ -105,7 +103,6 @@ func TestPrintPWD(t *testing.T) {
Env: env, Env: env,
Config: &config.Config{ Config: &config.Config{
PWD: tc.Config, PWD: tc.Config,
OSC99: tc.OSC99,
}, },
} }

2
src/segments/spotify_darwin.go
View file

@ -2,8 +2,6 @@
package segments package segments
const spotifyCacheKey = "spotify_music_player"
func (s *Spotify) Enabled() bool { func (s *Spotify) Enabled() bool {
// Check if running // Check if running
running := s.runAppleScriptCommand("application \"Spotify\" is running") running := s.runAppleScriptCommand("application \"Spotify\" is running")