1
1
using System ;
2
- using System . Collections . Generic ;
3
2
using System . Linq ;
4
3
using System . Runtime . InteropServices ;
5
- using System . Text . RegularExpressions ;
6
4
using System . Windows . Forms ;
7
5
using Antlr4 . Runtime ;
8
6
using Antlr4 . Runtime . Misc ;
@@ -270,7 +268,7 @@ private void RenameControl()
270
268
var form = _view . Target . QualifiedName . QualifiedModuleName . Component . CodeModule ;
271
269
var control = ( ( dynamic ) form . Parent . Designer ) . Controls ( _view . Target . IdentifierName ) ;
272
270
273
- foreach ( var handler in _declarations . FindEventHandlers ( _view . Target ) )
271
+ foreach ( var handler in _declarations . FindEventHandlers ( _view . Target ) . OrderByDescending ( h => h . Selection . StartColumn ) )
274
272
{
275
273
var newMemberName = handler . IdentifierName . Replace ( control . Name + '_' , _view . NewName + '_' ) ;
276
274
var module = handler . Project . VBComponents . Item ( handler . ComponentName ) . CodeModule ;
@@ -300,7 +298,7 @@ private void RenameUsages(Declaration target, string interfaceName = null)
300
298
var implementations = _declarations . FindInterfaceImplementationMembers ( )
301
299
. Where ( m => m . IdentifierName == target . ComponentName + '_' + target . IdentifierName ) ;
302
300
303
- foreach ( var member in implementations )
301
+ foreach ( var member in implementations . OrderByDescending ( m => m . Selection . StartColumn ) )
304
302
{
305
303
try
306
304
{
@@ -327,7 +325,7 @@ private void RenameUsages(Declaration target, string interfaceName = null)
327
325
var module = grouping . Key . Component . CodeModule ;
328
326
foreach ( var line in grouping . GroupBy ( reference => reference . Selection . StartLine ) )
329
327
{
330
- foreach ( var reference in line )
328
+ foreach ( var reference in line . OrderByDescending ( l => l . Selection . StartColumn ) )
331
329
{
332
330
var content = module . Lines [ line . Key , 1 ] ;
333
331
string newContent ;
@@ -351,7 +349,7 @@ private void RenameUsages(Declaration target, string interfaceName = null)
351
349
// renaming interface
352
350
if ( grouping . Any ( reference => reference . Context . Parent is VBAParser . ImplementsStmtContext ) )
353
351
{
354
- var members = _declarations . FindMembers ( target ) ;
352
+ var members = _declarations . FindMembers ( target ) . OrderByDescending ( m => m . Selection . StartColumn ) ;
355
353
foreach ( var member in members )
356
354
{
357
355
var oldMemberName = target . IdentifierName + '_' + member . IdentifierName ;
0 commit comments