Skip to content

Commit 24d6e01

Browse files
ryzngardryzngard
authored
Enable new inline rename by default (#62992)
1 parent 777d206 commit 24d6e01

29 files changed

+350
-88
lines changed

‎src/EditorFeatures/Core.Wpf/InlineRename/InlineRenameExperimentationOptions.cs‎ renamed to ‎src/EditorFeatures/Core.Wpf/InlineRename/InlineRenameUIOptions.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@
66

77
namespace Microsoft.CodeAnalysis.Editor.InlineRename
88
{
9-
internal sealed class InlineRenameExperimentationOptions
9+
internal sealed class InlineRenameUIOptions
1010
{
1111
public static readonly Option2<bool> UseInlineAdornment = new(
12-
feature: "InlineRenameExperimentation",
12+
feature: "InlineRename",
1313
name: "UseInlineAdornment",
14-
defaultValue: false,
15-
storageLocation: new FeatureFlagStorageLocation("Roslyn.UseInlineAdornmentForRename"));
14+
defaultValue: true,
15+
storageLocation: new FeatureFlagStorageLocation("Roslyn.Rename_UseInlineAdornment"));
1616
}
1717
}

‎src/EditorFeatures/Core.Wpf/InlineRename/UI/InlineRenameAdornmentManager.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ private void UpdateAdornments()
6868
{
6969
_dashboardColorUpdater?.UpdateColors();
7070

71-
var useInlineAdornment = _globalOptionService.GetOption(InlineRenameExperimentationOptions.UseInlineAdornment);
71+
var useInlineAdornment = _globalOptionService.GetOption(InlineRenameUIOptions.UseInlineAdornment);
7272
if (useInlineAdornment)
7373
{
7474
if (!_textView.HasAggregateFocus)

‎src/EditorFeatures/Test2/Rename/InlineRenameTests.vb‎

Lines changed: 48 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ Namespace Microsoft.CodeAnalysis.Editor.UnitTests.Rename
5454

5555
session.Commit()
5656

57-
Await VerifyTagsAreCorrect(workspace, "BarTest1")
57+
Await VerifyTagsAreCorrect(workspace)
5858
VerifyFileName(workspace, "BarTest1")
5959
End Using
6060
End Function
@@ -82,7 +82,7 @@ Namespace Microsoft.CodeAnalysis.Editor.UnitTests.Rename
8282

8383
session.Commit()
8484

85-
Await VerifyTagsAreCorrect(workspace, "renamedtest")
85+
Await VerifyTagsAreCorrect(workspace)
8686
End Using
8787
End Function
8888

@@ -136,7 +136,7 @@ class [|Test1$$|]
136136
textBuffer.Insert(selectedSpan, "<>")
137137

138138
session.Commit()
139-
Await VerifyTagsAreCorrect(workspace, "Test1<>")
139+
Await VerifyTagsAreCorrect(workspace)
140140
VerifyFileName(workspace, "Test1")
141141
End Using
142142
End Function
@@ -227,11 +227,11 @@ class Deconstructable
227227

228228
Await WaitForRename(workspace)
229229

230-
Await VerifyTagsAreCorrect(workspace, "BarTest1")
230+
Await VerifyTagsAreCorrect(workspace)
231231

232232
session.Commit()
233233

234-
Await VerifyTagsAreCorrect(workspace, "BarTest1")
234+
Await VerifyTagsAreCorrect(workspace)
235235
VerifyFileName(workspace, "BarTest1")
236236
End Using
237237
End Function
@@ -260,11 +260,11 @@ class Deconstructable
260260
Dim replacementText = renameTextPrefix + originalTextToRename
261261
Await WaitForRename(workspace)
262262

263-
Await VerifyTagsAreCorrect(workspace, replacementText)
263+
Await VerifyTagsAreCorrect(workspace)
264264

265265
session.Commit()
266266

267-
Await VerifyTagsAreCorrect(workspace, replacementText)
267+
Await VerifyTagsAreCorrect(workspace)
268268

269269
If renameFile Then
270270
If fileToRename Is Nothing Then
@@ -788,7 +788,7 @@ End Class
788788

789789
session.Commit()
790790

791-
Await VerifyTagsAreCorrect(workspace, "goodynamic")
791+
Await VerifyTagsAreCorrect(workspace)
792792
End Using
793793
End Function
794794

@@ -916,11 +916,11 @@ End Class
916916

917917
textBuffer.Insert(caretPosition, "Bar")
918918
Await WaitForRename(workspace)
919-
Await VerifyTagsAreCorrect(workspace, "BarTest1")
919+
Await VerifyTagsAreCorrect(workspace)
920920
Await VerifyNoRenameTrackingTags(renameTrackingTagger, workspace, document)
921921

922922
session.Commit()
923-
Await VerifyTagsAreCorrect(workspace, "BarTest1")
923+
Await VerifyTagsAreCorrect(workspace)
924924
VerifyFileName(workspace, "BarTest1")
925925
End Using
926926
End Function
@@ -950,11 +950,11 @@ End Class
950950
textBuffer.Insert(caretPosition, "Bar")
951951
Await WaitForRename(workspace)
952952

953-
Await VerifyTagsAreCorrect(workspace, "BarTest1")
953+
Await VerifyTagsAreCorrect(workspace)
954954
Await VerifyNoRenameTrackingTags(renameTrackingTagger, workspace, document)
955955

956956
session.Commit()
957-
Await VerifyTagsAreCorrect(workspace, "BarTest1")
957+
Await VerifyTagsAreCorrect(workspace)
958958
VerifyFileName(workspace, "BarTest1")
959959
End Using
960960
End Function
@@ -988,10 +988,10 @@ End Class
988988

989989
textBuffer.Insert(caretPosition, "Bar")
990990
Await WaitForRename(workspace)
991-
Await VerifyTagsAreCorrect(workspace, "BarTest1")
991+
Await VerifyTagsAreCorrect(workspace)
992992

993993
session.Commit()
994-
Await VerifyTagsAreCorrect(workspace, "BarTest1")
994+
Await VerifyTagsAreCorrect(workspace)
995995
Await VerifyNoRenameTrackingTags(renameTrackingTagger, workspace, document)
996996
VerifyFileName(workspace, "BarTest1")
997997
End Using
@@ -1026,7 +1026,7 @@ End Class
10261026

10271027
textBuffer.Insert(caretPosition, "Bar")
10281028
Await WaitForRename(workspace)
1029-
Await VerifyTagsAreCorrect(workspace, "BarGoo")
1029+
Await VerifyTagsAreCorrect(workspace)
10301030

10311031
session.Cancel()
10321032
Await VerifyNoRenameTrackingTags(renameTrackingTagger, workspace, document)
@@ -1063,10 +1063,10 @@ End Class
10631063

10641064
textBuffer.Insert(caretPosition, "Bar")
10651065
Await WaitForRename(workspace)
1066-
Await VerifyTagsAreCorrect(workspace, "BarTest1")
1066+
Await VerifyTagsAreCorrect(workspace)
10671067

10681068
session.Commit()
1069-
Await VerifyTagsAreCorrect(workspace, "BarTest1")
1069+
Await VerifyTagsAreCorrect(workspace)
10701070
Await VerifyNoRenameTrackingTags(renameTrackingTagger, workspace, document)
10711071
VerifyFileName(workspace, "BarTest1")
10721072

@@ -1106,7 +1106,7 @@ End Class
11061106

11071107
session.Commit(previewChanges:=True)
11081108

1109-
Await VerifyTagsAreCorrect(workspace, "BarGoo")
1109+
Await VerifyTagsAreCorrect(workspace)
11101110
Assert.True(previewService.Called)
11111111
Assert.Equal(String.Format(EditorFeaturesResources.Preview_Changes_0, EditorFeaturesResources.Rename), previewService.Title)
11121112
Assert.Equal(String.Format(EditorFeaturesResources.Rename_0_to_1_colon, "Goo", "BarGoo"), previewService.Description)
@@ -1137,28 +1137,20 @@ End Class
11371137
previewService.ReturnsNull = True
11381138

11391139
Dim session = StartSession(workspace)
1140-
' Type a bit in the file
1141-
Dim caretPosition = workspace.Documents.Single(Function(d) d.CursorPosition.HasValue).CursorPosition.Value
1142-
Dim textBuffer = workspace.Documents.Single().GetTextBuffer()
1143-
1144-
textBuffer.Insert(caretPosition, "Bar")
1145-
1140+
session.ApplyReplacementText("BarGoo", propagateEditImmediately:=True)
11461141
session.Commit(previewChanges:=True)
11471142

1148-
Await VerifyTagsAreCorrect(workspace, "BarGoo")
1143+
Await VerifyTagsAreCorrect(workspace)
11491144
Assert.True(previewService.Called)
11501145

1151-
' Session should still be up; type some more
1152-
caretPosition = workspace.Documents.Single(Function(d) d.CursorPosition.HasValue).CursorPosition.Value
1153-
textBuffer.Insert(caretPosition, "Cat")
1146+
' Session should still be up
1147+
session.ApplyReplacementText("CatBarGoo", propagateEditImmediately:=True)
11541148

11551149
previewService.ReturnsNull = False
11561150
previewService.Called = False
11571151
session.Commit(previewChanges:=True)
1158-
Await VerifyTagsAreCorrect(workspace, "CatBarGoo")
1152+
Await VerifyTagsAreCorrect(workspace)
11591153
Assert.True(previewService.Called)
1160-
1161-
VerifyFileName(workspace, "Test1.cs")
11621154
End Using
11631155
End Function
11641156

@@ -1197,14 +1189,14 @@ End Class
11971189

11981190
textBuffer.Insert(caretPosition, "o")
11991191
Await WaitForRename(workspace)
1200-
Await VerifyTagsAreCorrect(workspace, "Mo")
1192+
Await VerifyTagsAreCorrect(workspace)
12011193

12021194
textBuffer.Insert(caretPosition + 1, "w")
12031195
Await WaitForRename(workspace)
1204-
Await VerifyTagsAreCorrect(workspace, "Mow")
1196+
Await VerifyTagsAreCorrect(workspace)
12051197

12061198
session.Commit()
1207-
Await VerifyTagsAreCorrect(workspace, "Mow")
1199+
Await VerifyTagsAreCorrect(workspace)
12081200
End Using
12091201
End Function
12101202

@@ -1242,14 +1234,14 @@ End Class
12421234

12431235
textBuffer.Insert(caretPosition, "a")
12441236
Await WaitForRename(workspace)
1245-
Await VerifyTagsAreCorrect(workspace, "ma")
1237+
Await VerifyTagsAreCorrect(workspace)
12461238

12471239
textBuffer.Insert(caretPosition + 1, "w")
12481240
Await WaitForRename(workspace)
1249-
Await VerifyTagsAreCorrect(workspace, "maw")
1241+
Await VerifyTagsAreCorrect(workspace)
12501242

12511243
session.Commit()
1252-
Await VerifyTagsAreCorrect(workspace, "maw")
1244+
Await VerifyTagsAreCorrect(workspace)
12531245
End Using
12541246
End Function
12551247

@@ -1326,11 +1318,11 @@ class C
13261318
textBuffer.CurrentSnapshot.GetText())
13271319

13281320
' Rename should still be active
1329-
Await VerifyTagsAreCorrect(workspace, "xyz")
1321+
Await VerifyTagsAreCorrect(workspace)
13301322

13311323
textBuffer.Insert(caretPosition + 2, "q")
13321324
Await WaitForRename(workspace)
1333-
Await VerifyTagsAreCorrect(workspace, "xyzq")
1325+
Await VerifyTagsAreCorrect(workspace)
13341326
End Using
13351327
End Function
13361328

@@ -1359,10 +1351,10 @@ class C
13591351

13601352
textBuffer.Insert(caretPosition, "a")
13611353
Await WaitForRename(workspace)
1362-
Await VerifyTagsAreCorrect(workspace, "Ma")
1354+
Await VerifyTagsAreCorrect(workspace)
13631355

13641356
session.Commit()
1365-
Await VerifyTagsAreCorrect(workspace, "Ma")
1357+
Await VerifyTagsAreCorrect(workspace)
13661358
End Using
13671359
End Function
13681360

@@ -1391,10 +1383,10 @@ class C
13911383

13921384
textBuffer.Insert(caretPosition, "a")
13931385
Await WaitForRename(workspace)
1394-
Await VerifyTagsAreCorrect(workspace, "Ma")
1386+
Await VerifyTagsAreCorrect(workspace)
13951387

13961388
session.Commit()
1397-
Await VerifyTagsAreCorrect(workspace, "Ma")
1389+
Await VerifyTagsAreCorrect(workspace)
13981390
End Using
13991391
End Function
14001392

@@ -1425,10 +1417,10 @@ class C
14251417

14261418
textBuffer.Insert(caretPosition, "a")
14271419
Await WaitForRename(workspace)
1428-
Await VerifyTagsAreCorrect(workspace, "Ma")
1420+
Await VerifyTagsAreCorrect(workspace)
14291421

14301422
session.Commit()
1431-
Await VerifyTagsAreCorrect(workspace, "Ma")
1423+
Await VerifyTagsAreCorrect(workspace)
14321424
End Using
14331425
End Function
14341426

@@ -1459,10 +1451,10 @@ class C
14591451

14601452
textBuffer.Insert(caretPosition, "a")
14611453
Await WaitForRename(workspace)
1462-
Await VerifyTagsAreCorrect(workspace, "Ma")
1454+
Await VerifyTagsAreCorrect(workspace)
14631455

14641456
session.Commit()
1465-
Await VerifyTagsAreCorrect(workspace, "Ma")
1457+
Await VerifyTagsAreCorrect(workspace)
14661458
End Using
14671459
End Function
14681460

@@ -1522,7 +1514,7 @@ End Module
15221514
textBuffer.Insert(caretPosition, "q")
15231515
session.Commit()
15241516

1525-
Await VerifyTagsAreCorrect(workspace, "qp")
1517+
Await VerifyTagsAreCorrect(workspace)
15261518
End Using
15271519
End Function
15281520

@@ -1552,7 +1544,7 @@ End Module
15521544

15531545
session.Commit()
15541546

1555-
Await VerifyTagsAreCorrect(workspace, "x")
1547+
Await VerifyTagsAreCorrect(workspace)
15561548
End Using
15571549
End Function
15581550

@@ -1596,7 +1588,7 @@ End Class
15961588

15971589
session.Commit()
15981590

1599-
Await VerifyTagsAreCorrect(workspace, "xield1")
1591+
Await VerifyTagsAreCorrect(workspace)
16001592
End Using
16011593
End Function
16021594

@@ -1897,7 +1889,7 @@ class [|$$Test1|]
18971889
Dim committed = session.GetTestAccessor().CommitWorker(previewChanges:=False)
18981890
Assert.False(committed)
18991891

1900-
Await VerifyTagsAreCorrect(workspace, "Test1")
1892+
Await VerifyTagsAreCorrect(workspace)
19011893
End Using
19021894
End Function
19031895

@@ -1981,7 +1973,7 @@ class [|C|]
19811973

19821974
session.Commit()
19831975

1984-
Await VerifyTagsAreCorrect(workspace, "BarGoo")
1976+
Await VerifyTagsAreCorrect(workspace)
19851977
End Using
19861978
End Function
19871979

@@ -2011,7 +2003,7 @@ class [|C|]
20112003

20122004
session.Commit()
20132005

2014-
Await VerifyTagsAreCorrect(workspace, "BarGoo")
2006+
Await VerifyTagsAreCorrect(workspace)
20152007
End Using
20162008
End Function
20172009

@@ -2041,7 +2033,7 @@ class [|C|]
20412033

20422034
session.Commit()
20432035

2044-
Await VerifyTagsAreCorrect(workspace, "BarGoo")
2036+
Await VerifyTagsAreCorrect(workspace)
20452037
End Using
20462038
End Function
20472039

@@ -2076,7 +2068,7 @@ class [|C|]
20762068

20772069
session.Commit()
20782070

2079-
Await VerifyTagsAreCorrect(workspace, "BarGoo")
2071+
Await VerifyTagsAreCorrect(workspace)
20802072
End Using
20812073
End Function
20822074

@@ -2107,7 +2099,7 @@ class [|C|]
21072099

21082100
session.Commit()
21092101

2110-
Await VerifyTagsAreCorrect(workspace, "Example")
2102+
Await VerifyTagsAreCorrect(workspace)
21112103
End Using
21122104
End Function
21132105

0 commit comments

Comments
 (0)