Skip to content

Commit 17075d6

Browse files
committed
Merge branch 'dev/migrie/fhl/scratchpad-pane' into dev/migrie/f/sui-panes
2 parents 092b355 + 25a8851 commit 17075d6

File tree

181 files changed

+6961
-10345
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

181 files changed

+6961
-10345
lines changed

.github/actions/spelling/allow/allow.txt

+2
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,8 @@ ptys
9090
pwshw
9191
qof
9292
qps
93+
Remappings
94+
Retargets
9395
rclt
9496
reimplementation
9597
reserialization

.github/actions/spelling/allow/apis.txt

+6
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,9 @@ COLORPROPERTY
2222
colspan
2323
COMDLG
2424
commandlinetoargv
25+
commoncontrols
2526
comparand
27+
COPYFROMRESOURCE
2628
cstdint
2729
CXICON
2830
CYICON
@@ -42,6 +44,7 @@ endfor
4244
ENDSESSION
4345
enumset
4446
environstrings
47+
EXACTSIZEONLY
4548
EXPCMDFLAGS
4649
EXPCMDSTATE
4750
filetime
@@ -59,6 +62,7 @@ Hashtable
5962
HIGHCONTRASTON
6063
HIGHCONTRASTW
6164
hinternet
65+
HIGHQUALITYSCALE
6266
HINTERNET
6367
hotkeys
6468
href
@@ -75,6 +79,7 @@ IBox
7579
IClass
7680
IComparable
7781
IComparer
82+
ICONINFO
7883
IConnection
7984
ICustom
8085
IDialog
@@ -84,6 +89,7 @@ IExplorer
8489
IFACEMETHOD
8590
IFile
8691
IGraphics
92+
IImage
8793
IInheritable
8894
IMap
8995
IMonarch

.github/actions/spelling/excludes.txt

+1
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,7 @@
115115
^src/terminal/parser/ut_parser/Base64Test.cpp$
116116
^src/terminal/parser/ut_parser/run\.bat$
117117
^src/tools/benchcat
118+
^src/tools/ConsoleBench
118119
^src/tools/integrity/dirs$
119120
^src/tools/integrity/packageuwp/ConsoleUWP\.appxSources$
120121
^src/tools/RenderingTests/main\.cpp$

.github/actions/spelling/expect/expect.txt

+11
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ AFew
1919
AFill
2020
AFX
2121
AHelper
22+
ahicon
2223
ahz
2324
AImpl
2425
AInplace
@@ -429,6 +430,7 @@ DECRQM
429430
DECRQPSR
430431
DECRQSS
431432
DECRQTSR
433+
DECRQUPSS
432434
DECRSPS
433435
decrst
434436
DECSACE
@@ -843,6 +845,9 @@ IGNORELANGUAGE
843845
IHosted
844846
iid
845847
IIo
848+
ILC
849+
ILCo
850+
ILD
846851
ime
847852
IMPEXP
848853
inbox
@@ -1340,11 +1345,14 @@ pgomgr
13401345
PGONu
13411346
pguid
13421347
phhook
1348+
phico
1349+
phicon
13431350
phwnd
13441351
pidl
13451352
PIDLIST
13461353
pids
13471354
pii
1355+
piml
13481356
pinvoke
13491357
pipename
13501358
pipestr
@@ -1676,6 +1684,8 @@ slpit
16761684
SManifest
16771685
SMARTQUOTE
16781686
SMTO
1687+
snapcx
1688+
snapcy
16791689
SOLIDBOX
16801690
Solutiondir
16811691
somefile
@@ -1901,6 +1911,7 @@ UPDATEDISPLAY
19011911
UPDOWN
19021912
UPKEY
19031913
UPSS
1914+
upss
19041915
uregex
19051916
URegular
19061917
usebackq

OpenConsole.sln

+23-421
Large diffs are not rendered by default.

build/pipelines/templates-v2/job-pgo-build-nuget-and-publish.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ jobs:
4343

4444
- template: steps-ensure-nuget-version.yml
4545

46-
- task: NuGetAuthenticate@0
46+
- task: NuGetAuthenticate@1
4747
inputs:
4848
nuGetServiceConnections: 'Terminal Public Artifact Feed'
4949

build/pipelines/templates-v2/pipeline-onebranch-full-release-build.yml

+3
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,9 @@ extends:
7878
cloudvault: # https://aka.ms/obpipelines/cloudvault
7979
enabled: false
8080
globalSdl: # https://aka.ms/obpipelines/sdl
81+
asyncSdl:
82+
enabled: true
83+
tsaOptionsFile: 'build/config/tsa.json'
8184
tsa:
8285
enabled: true
8386
configFile: '$(Build.SourcesDirectory)\build\config\tsa.json'

build/pipelines/templates-v2/steps-restore-nuget.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
steps:
22
- template: steps-ensure-nuget-version.yml
33

4-
- task: NuGetAuthenticate@0
4+
- task: NuGetAuthenticate@1
55

66
- script: |-
77
echo ##vso[task.setvariable variable=NUGET_RESTORE_MSBUILD_ARGS]/p:Platform=$(BuildPlatform)

doc/cascadia/profiles.schema.json

+5-5
Original file line numberDiff line numberDiff line change
@@ -2782,15 +2782,15 @@
27822782
"description": "When set to true, marks added to the buffer via the addMark action will appear on the scrollbar.",
27832783
"type": "boolean"
27842784
},
2785+
"experimental.repositionCursorWithMouse": {
2786+
"default": false,
2787+
"description": "When set to true, you can move the text cursor by clicking with the mouse on the current commandline. This is an experimental feature - there are lots of edge cases where this will not work as expected.",
2788+
"type": "boolean"
2789+
},
27852790
"experimental.pixelShaderPath": {
27862791
"description": "Use to set a path to a pixel shader to use with the Terminal. Overrides `experimental.retroTerminalEffect`. This is an experimental feature, and its continued existence is not guaranteed.",
27872792
"type": "string"
27882793
},
2789-
"useAtlasEngine": {
2790-
"description": "Windows Terminal 1.16 and later ship with a new, performant text renderer. Set this to false to revert back to the old text renderer.",
2791-
"type": "boolean",
2792-
"default": true
2793-
},
27942794
"fontFace": {
27952795
"default": "Cascadia Mono",
27962796
"description": "[deprecated] Define 'face' within the 'font' object instead.",

src/buffer/out/Row.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ til::CoordType CharToColumnMapper::GetLeadingColumnAt(ptrdiff_t offset) noexcept
9797
offset = clamp(offset, 0, _lastCharOffset);
9898

9999
auto col = _currentColumn;
100-
const auto currentOffset = _charOffsets[col];
100+
const auto currentOffset = _charOffsets[col] & CharOffsetsMask;
101101

102102
// Goal: Move the _currentColumn cursor to a cell which contains the given target offset.
103103
// Depending on where the target offset is we have to either search forward or backward.

0 commit comments

Comments
 (0)