@@ -76,6 +76,7 @@ public void SplittingExistingString_PutsCaretAtSameRelativePosition()
76
76
77
77
private static TestCodeString Run ( TestCodeString original , char input , bool isCtrlDown = false , bool isDeleteKey = false )
78
78
{
79
+
79
80
var sut = InitializeSut ( original , out var module , out var settings ) ;
80
81
var args = new AutoCompleteEventArgs ( module . Object , input , isCtrlDown , isDeleteKey ) ;
81
82
@@ -102,7 +103,9 @@ private static SmartConcatenationHandler InitializeSut(TestCodeString original,
102
103
module = new Mock < ICodeModule > ( ) ;
103
104
pane = new Mock < ICodePane > ( ) ;
104
105
pane . SetupProperty ( m => m . Selection ) ;
105
- pane . Object . Selection = new Selection ( original . SnippetPosition . StartLine , 1 , original . SnippetPosition . EndLine , 1 ) . Offset ( original . CaretPosition ) ;
106
+ var paneSelection = new Selection ( original . SnippetPosition . StartLine + original . CaretPosition . StartLine , original . CaretPosition . StartColumn + 1 ) ;
107
+ pane . Object . Selection = paneSelection ;
108
+
106
109
module . Setup ( m => m . DeleteLines ( original . SnippetPosition . StartLine , original . SnippetPosition . LineCount ) ) ;
107
110
module . Setup ( m => m . InsertLines ( original . SnippetPosition . StartLine , original . Code ) ) ;
108
111
module . Setup ( m => m . CodePane ) . Returns ( pane . Object ) ;
@@ -112,6 +115,7 @@ private static SmartConcatenationHandler InitializeSut(TestCodeString original,
112
115
module . Setup ( m => m . GetLines ( index + 1 , 1 ) ) . Returns ( original . Lines [ index ] ) ;
113
116
}
114
117
module . Setup ( m => m . GetLines ( original . SnippetPosition ) ) . Returns ( prettified . Code ) ;
118
+ module . Setup ( m => m . GetLines ( paneSelection . StartLine , paneSelection . LineCount ) ) . Returns ( prettified . CaretLine ) ;
115
119
116
120
settings = new AutoCompleteSettings { IsEnabled = true } ;
117
121
settings . SmartConcat . IsEnabled = true ;
0 commit comments