Skip to content

Commit 5dcace9

Browse files
JamesAndrewJackson13JamesAndrewJackson13
authored
Merge branch 'main' into feat-owm-set-location-by-env-var
2 parents 9a3eef9 + bffde60 commit 5dcace9

File tree

5 files changed

+24
-15
lines changed

5 files changed

+24
-15
lines changed

‎.all-contributorsrc‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2684,6 +2684,15 @@
26842684
"code",
26852685
"doc"
26862686
]
2687+
},
2688+
{
2689+
"login": "clemyan",
2690+
"name": "Clement Yan",
2691+
"avatar_url": "https://avatars.githubusercontent.com/u/41266433?v=4",
2692+
"profile": "https://github.com/clemyan",
2693+
"contributions": [
2694+
"code"
2695+
]
26872696
}
26882697
],
26892698
"contributorsPerLine": 7,

‎src/go.mod‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,9 @@ require (
2828

2929
require (
3030
github.com/ConradIrwin/font v0.0.0-20210318200717-ce8d41cc0732
31-
github.com/charmbracelet/bubbles v0.18.0
31+
github.com/charmbracelet/bubbles v0.19.0
3232
github.com/charmbracelet/bubbletea v0.27.0
33-
github.com/charmbracelet/lipgloss v0.12.1
33+
github.com/charmbracelet/lipgloss v0.13.0
3434
github.com/goccy/go-json v0.10.3
3535
github.com/goccy/go-yaml v1.11.3
3636
github.com/gookit/goutil v0.6.16
@@ -82,7 +82,6 @@ require (
8282
github.com/mitchellh/go-wordwrap v1.0.1 // indirect
8383
github.com/muesli/ansi v0.0.0-20230316100256-276c6243b2f6 // indirect
8484
github.com/muesli/cancelreader v0.2.2 // indirect
85-
github.com/muesli/reflow v0.3.0 // indirect
8685
github.com/muesli/termenv v0.15.2 // indirect
8786
github.com/power-devops/perfstat v0.0.0-20240221224432-82ca36839d55 // indirect
8887
github.com/rivo/uniseg v0.4.7 // indirect

‎src/go.sum‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,12 @@ github.com/apparentlymart/go-textseg/v15 v15.0.0 h1:uYvfpb3DyLSCGWnctWKGj857c6ew
2323
github.com/apparentlymart/go-textseg/v15 v15.0.0/go.mod h1:K8XmNZdhEBkdlyDdvbmmsvpAG721bKi0joRfFdHIWJ4=
2424
github.com/aymanbagabas/go-osc52/v2 v2.0.1 h1:HwpRHbFMcZLEVr42D4p7XBqjyuxQH5SMiErDT4WkJ2k=
2525
github.com/aymanbagabas/go-osc52/v2 v2.0.1/go.mod h1:uYgXzlJ7ZpABp8OJ+exZzJJhRNQ2ASbcXHWsFqH8hp8=
26-
github.com/charmbracelet/bubbles v0.18.0 h1:PYv1A036luoBGroX6VWjQIE9Syf2Wby2oOl/39KLfy0=
27-
github.com/charmbracelet/bubbles v0.18.0/go.mod h1:08qhZhtIwzgrtBjAcJnij1t1H0ZRjwHyGsy6AL11PSw=
26+
github.com/charmbracelet/bubbles v0.19.0 h1:gKZkKXPP6GlDk6EcfujDK19PCQqRjaJZQ7QRERx1UF0=
27+
github.com/charmbracelet/bubbles v0.19.0/go.mod h1:WILteEqZ+krG5c3ntGEMeG99nCupcuIk7V0/zOP0tOA=
2828
github.com/charmbracelet/bubbletea v0.27.0 h1:Mznj+vvYuYagD9Pn2mY7fuelGvP0HAXtZYGgRBCbHvU=
2929
github.com/charmbracelet/bubbletea v0.27.0/go.mod h1:5MdP9XH6MbQkgGhnlxUqCNmBXf9I74KRQ8HIidRxV1Y=
30-
github.com/charmbracelet/lipgloss v0.12.1 h1:/gmzszl+pedQpjCOH+wFkZr/N90Snz40J/NR7A0zQcs=
31-
github.com/charmbracelet/lipgloss v0.12.1/go.mod h1:V2CiwIuhx9S1S1ZlADfOj9HmxeMAORuz5izHb0zGbB8=
30+
github.com/charmbracelet/lipgloss v0.13.0 h1:4X3PPeoWEDCMvzDvGmTajSyYPcZM4+y8sCA/SsA3cjw=
31+
github.com/charmbracelet/lipgloss v0.13.0/go.mod h1:nw4zy0SBX/F/eAO1cWdcvy6qnkDUxr8Lw7dvFrAIbbY=
3232
github.com/charmbracelet/x/ansi v0.1.4 h1:IEU3D6+dWwPSgZ6HBH+v6oUuZ/nVawMiWj5831KfiLM=
3333
github.com/charmbracelet/x/ansi v0.1.4/go.mod h1:dk73KoMTT5AX5BsX0KrqhsTqAnhZZoCBjs7dGWp4Ktw=
3434
github.com/charmbracelet/x/input v0.1.2 h1:QJAZr33eOhDowkkEQ24rsJy4Llxlm+fRDf/cQrmqJa0=
@@ -116,7 +116,6 @@ github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWE
116116
github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
117117
github.com/mattn/go-localereader v0.0.1 h1:ygSAOl7ZXTx4RdPYinUpg6W99U8jWvWi9Ye2JC/oIi4=
118118
github.com/mattn/go-localereader v0.0.1/go.mod h1:8fBrzywKY7BI3czFoHkuzRoWE9C+EiG4R1k4Cjx5p88=
119-
github.com/mattn/go-runewidth v0.0.12/go.mod h1:RAqKPSqVFrSLVXbA8x7dzmKdmGzieGRCM46jaSJTDAk=
120119
github.com/mattn/go-runewidth v0.0.16 h1:E5ScNMtiwvlvB5paMFdw9p4kSQzbXFikJ5SQO6TULQc=
121120
github.com/mattn/go-runewidth v0.0.16/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w=
122121
github.com/mitchellh/copystructure v1.0.0/go.mod h1:SNtv71yrdKgLRyLFxmLdkAbkKEFWgYaq1OVrnRcwhnw=
@@ -131,8 +130,6 @@ github.com/muesli/ansi v0.0.0-20230316100256-276c6243b2f6 h1:ZK8zHtRHOkbHy6Mmr5D
131130
github.com/muesli/ansi v0.0.0-20230316100256-276c6243b2f6/go.mod h1:CJlz5H+gyd6CUWT45Oy4q24RdLyn7Md9Vj2/ldJBSIo=
132131
github.com/muesli/cancelreader v0.2.2 h1:3I4Kt4BQjOR54NavqnDogx/MIoWBFa0StPA8ELUXHmA=
133132
github.com/muesli/cancelreader v0.2.2/go.mod h1:3XuTXfFS2VjM+HTLZY9Ak0l6eUKfijIfMUZ4EgX0QYo=
134-
github.com/muesli/reflow v0.3.0 h1:IFsN6K9NfGtjeggFP+68I4chLZV2yIKsXJFNZ+eWh6s=
135-
github.com/muesli/reflow v0.3.0/go.mod h1:pbwTDkVPibjO2kyvBQRBxTWEEGDGq0FlB1BIKtnHY/8=
136133
github.com/muesli/termenv v0.15.2 h1:GohcuySI0QmI3wN8Ok9PtKGkgkFIk7y6Vpb5PvrY+Wo=
137134
github.com/muesli/termenv v0.15.2/go.mod h1:Epx+iuz8sNs7mNKhxzH4fWXGNpZwUaJKRS1noLXviQ8=
138135
github.com/pelletier/go-toml/v2 v2.2.2 h1:aYUidT7k73Pcl9nb2gScu7NSrKCSHIDE89b3+6Wq+LM=
@@ -141,7 +138,6 @@ github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZb
141138
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
142139
github.com/power-devops/perfstat v0.0.0-20240221224432-82ca36839d55 h1:o4JXh1EVt9k/+g42oCprj/FisM4qX9L3sZB3upGN2ZU=
143140
github.com/power-devops/perfstat v0.0.0-20240221224432-82ca36839d55/go.mod h1:OmDBASR4679mdNQnz2pUhc2G8CO2JrUAVFDRBDP/hJE=
144-
github.com/rivo/uniseg v0.1.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
145141
github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
146142
github.com/rivo/uniseg v0.4.7 h1:WUdvkW8uEhrYfLC4ZzdpI2ztxP1I582+49Oc5Mq64VQ=
147143
github.com/rivo/uniseg v0.4.7/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88=

‎src/prompt/extra.go‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -110,10 +110,14 @@ func (e *Engine) ExtraPrompt(promptType ExtraPromptType) string {
110110
}
111111
return str
112112
case shell.PWSH, shell.PWSH5:
113-
// Return the string and empty our buffer
114-
// clear the line afterwards to prevent text from being written on the same line
115-
// see https://github.com/JanDeDobbeleer/oh-my-posh/issues/3628
116-
return str + terminal.ClearAfter()
113+
if promptType == Transient {
114+
// Return the string and empty our buffer
115+
// clear the line afterwards to prevent text from being written on the same line
116+
// see https://github.com/JanDeDobbeleer/oh-my-posh/issues/3628
117+
return str + terminal.ClearAfter()
118+
}
119+
120+
return str
117121
case shell.CMD, shell.BASH, shell.FISH, shell.NU, shell.GENERIC:
118122
// Return the string and empty our buffer
119123
return str

‎website/docs/contributors.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -378,6 +378,7 @@ Thanks goes to these wonderful people ([emoji key][acek]):
378378
<td align="center" valign="top" width="14.28%"><a href="https://github.com/Soyvolon"><img src="https://avatars.githubusercontent.com/u/16871668?v=4?s=100" width="100px;" alt="Bounds"/><br /><sub><b>Bounds</b></sub></a><br /><a href="https://github.com/JanDeDobbeleer/oh-my-posh/commits?author=Soyvolon" title="Code">💻</a> <a href="https://github.com/JanDeDobbeleer/oh-my-posh/commits?author=Soyvolon" title="Documentation">📖</a></td>
379379
<td align="center" valign="top" width="14.28%"><a href="http://yashgarg.dev"><img src="https://avatars.githubusercontent.com/u/33605526?v=4?s=100" width="100px;" alt="Yash Garg"/><br /><sub><b>Yash Garg</b></sub></a><br /><a href="https://github.com/JanDeDobbeleer/oh-my-posh/commits?author=Yash-Garg" title="Code">💻</a> <a href="#design-Yash-Garg" title="Design">🎨</a> <a href="https://github.com/JanDeDobbeleer/oh-my-posh/commits?author=Yash-Garg" title="Documentation">📖</a></td>
380380
<td align="center" valign="top" width="14.28%"><a href="https://github.com/sarpuser"><img src="https://avatars.githubusercontent.com/u/23362324?v=4?s=100" width="100px;" alt="Sarp User"/><br /><sub><b>Sarp User</b></sub></a><br /><a href="https://github.com/JanDeDobbeleer/oh-my-posh/commits?author=sarpuser" title="Code">💻</a> <a href="https://github.com/JanDeDobbeleer/oh-my-posh/commits?author=sarpuser" title="Documentation">📖</a></td>
381+
<td align="center" valign="top" width="14.28%"><a href="https://github.com/clemyan"><img src="https://avatars.githubusercontent.com/u/41266433?v=4?s=100" width="100px;" alt="Clement Yan"/><br /><sub><b>Clement Yan</b></sub></a><br /><a href="https://github.com/JanDeDobbeleer/oh-my-posh/commits?author=clemyan" title="Code">💻</a></td>
381382
</tr>
382383
</tbody>
383384
</table>

0 commit comments

Comments
 (0)