@@ -88,6 +88,17 @@ - (void)formatSelectedFiles {
8888}
8989
9090- (void )formatDocument : (IDESourceCodeDocument *)document {
91+ NSRect rect = [[TRVSXcodetextView ]visibleRect ];
92+ NSPoint containerOrigin = [[TRVSXcodetextView ]textContainerOrigin ];
93+ rect =NSOffsetRect (rect, -containerOrigin.x , -containerOrigin.y );
94+ NSRange glyphRange = [[[TRVSXcodetextView ]layoutManager ]
95+ glyphRangeForBoundingRect: rect
96+ inTextContainer: [[TRVSXcodetextView ]textContainer ]];
97+ NSRange charRange = [[[TRVSXcodetextView ]layoutManager ]
98+ characterRangeForGlyphRange: glyphRange
99+ actualGlyphRange: NULL ];
100+
101+
91102NSUInteger location = [[TRVSXcodetextView ]selectedRange ].location ;
92103NSUInteger length = [[documenttextStorage ]length ];
93104
@@ -102,13 +113,15 @@ - (void)formatDocument:(IDESourceCodeDocument *)document {
102113
103114if (documentIsLongerAfterFormatting && location > diff) {
104115 location -= diff;
116+ charRange.length -= diff;
105117 }else if (!documentIsLongerAfterFormatting) {
106118 location += diff;
119+ charRange.length += diff;
107120 }
108121
109122NSRange range =NSMakeRange (location,0 );
110123 [[TRVSXcodetextView ]setSelectedRange: range];
111- [[TRVSXcodetextView ]scrollRangeToVisible: range ];
124+ [[TRVSXcodetextView ]scrollRangeToVisible: charRange ];
112125}
113126
114127#pragma mark - Private