rename SourceCodeEditorView -> SourceEditorView

XVimProject · Jun 10, 2019 · cf20d82 · cf20d82
1 parent 36aec01
commit cf20d82
Show file tree

Hide file tree

Showing 24 changed files with 306 additions and 306 deletions.
diff --git a/XVim2-Bridging-Header.h b/XVim2-Bridging-Header.h
@@ -9,7 +9,7 @@
 #ifndef XVim2_Bridging_Header_h
 #define XVim2_Bridging_Header_h
 
-#import "XVim2/Xcode/SourceCodeEditorViewProxy.h"
+#import "XVim2/Xcode/SourceEditorViewProxy.h"
 #import "XVim2/Helper/rd_route.h"
 #import "XVim2/Helper/Logger.h"
 

diff --git a/XVim2.xcodeproj/project.pbxproj b/XVim2.xcodeproj/project.pbxproj
diff --git a/XVim2/UnitTest/XVimTestCase.m b/XVim2/UnitTest/XVimTestCase.m
@@ -8,8 +8,8 @@
 
 #import "XVimTestCase.h"
 #import "Logger.h"
-#import "SourceCodeEditorViewProxy.h"
-#import "SourceCodeEditorViewProxy+XVim.h"
+#import "SourceEditorViewProxy.h"
+#import "SourceEditorViewProxy+XVim.h"
 #import "XVimKeyStroke.h"
 #import "XVimWindow.h"
 #import "XcodeUtils.h"

diff --git a/XVim2/UnitTest/XVimTester.m b/XVim2/UnitTest/XVimTester.m
@@ -8,7 +8,7 @@
 
 #import "XVimTester.h"
 #import "Logger.h"
-#import "SourceCodeEditorViewProxy.h"
+#import "SourceEditorViewProxy.h"
 #import "XVimKeyStroke.h"
 #import "XVimTestCase.h"
 #import "XcodeUtils.h"

diff --git a/XVim2/XVim/Evaluator/MotionArgument/XVimZEvaluator.m b/XVim2/XVim/Evaluator/MotionArgument/XVimZEvaluator.m
@@ -8,7 +8,7 @@
 
 #import "XVimZEvaluator.h"
 #import "Logger.h"
-#import "SourceCodeEditorViewProxy.h"
+#import "SourceEditorViewProxy.h"
 #import "XVimMotionEvaluator.h"
 
 @implementation XVimZEvaluator

diff --git a/XVim2/XVim/Evaluator/Operators/XVimDeleteEvaluator.m b/XVim2/XVim/Evaluator/Operators/XVimDeleteEvaluator.m
@@ -10,7 +10,7 @@
 #import "XVimInsertEvaluator.h"
 #import "XVimWindow.h"
 #import "Logger.h"
-#import "SourceCodeEditorViewProxy.h"
+#import "SourceEditorViewProxy.h"
 #import "XVim.h"
 #import "XVimTextObjectEvaluator.h"
 

diff --git a/XVim2/XVim/Evaluator/XVimCommandLineEvaluator.m b/XVim2/XVim/Evaluator/XVimCommandLineEvaluator.m
@@ -8,7 +8,7 @@
 
 #import "XVimCommandLineEvaluator.h"
 #import "Logger.h"
-#import "SourceCodeEditorViewProxy.h"
+#import "SourceEditorViewProxy.h"
 #import "SourceViewProtocol.h"
 #import "XVim.h"
 #import "XVimCommandField.h"

diff --git a/XVim2/Xcode/IDEWorkspaceTabController+XVim.m b/XVim2/Xcode/IDEWorkspaceTabController+XVim.m
@@ -10,7 +10,7 @@
 #import "IDEWorkspaceTabController+XVim.h"
 #import "Logger.h"
 #import "NSObject+Swizzle.h"
-#import "SourceCodeEditorViewProxy.h"
+#import "SourceEditorViewProxy.h"
 #import "XVimWindow.h"
 #import "XcodeUtils.h"
 #import <IDEKit/IDEComparisonEditorSubmode.h>

diff --git a/XVim2/Xcode/SourceEditorDataSourceWrapper.swift b/XVim2/Xcode/SourceEditorDataSourceWrapper.swift
@@ -88,15 +88,15 @@ class SourceEditorDataSourceWrapper: NSObject {
     private let fpLineTerminatorLength
         = function_ptr_from_name("_$s12SourceEditor0ab4DataA0C27lineTerminatorLengthForLineyS2iF", nil)
 
-    private weak var sourceCodeEditorViewWrapper: SourceCodeEditorViewWrapper?
+    private weak var sourceEditorViewWrapper: SourceEditorViewWrapper?
 
     private var dataSource: AnyObject? {
-        return sourceCodeEditorViewWrapper?.dataSource
+        return sourceEditorViewWrapper?.dataSource
     }
 
     @objc
-    public init(withSourceCodeEditorViewWrapper wrapper: SourceCodeEditorViewWrapper) {
-        sourceCodeEditorViewWrapper = wrapper
+    public init(withSourceEditorViewWrapper wrapper: SourceEditorViewWrapper) {
+        sourceEditorViewWrapper = wrapper
     }
 
     @objc

diff --git a/...de/SourceCodeEditorViewProxy+Operations.h → .../Xcode/SourceEditorViewProxy+Operations.h b/...de/SourceCodeEditorViewProxy+Operations.h → .../Xcode/SourceEditorViewProxy+Operations.h
@@ -1,15 +1,15 @@
 //
-//  SourceCodeEditorViewProxy+Operations.h
+//  SourceEditorViewProxy+Operations.h
 //  XVim2
 //
 //  Created by Ant on 02/10/2017.
 //  Copyright © 2017 Shuichiro Suzuki. All rights reserved.
 //
 
-#import "SourceCodeEditorViewProxy.h"
+#import "SourceEditorViewProxy.h"
 #import <Foundation/Foundation.h>
 
-@interface SourceCodeEditorViewProxy (Operations) <SourceViewOperationsProtocol>
+@interface SourceEditorViewProxy (Operations) <SourceViewOperationsProtocol>
 - (BOOL)xvim_delete:(XVimMotion*)motion withMotionPoint:(NSUInteger)motionPoint andYank:(BOOL)yank;
 - (BOOL)xvim_delete:(XVimMotion*)motion andYank:(BOOL)yank;
 @end
diff --git a/...de/SourceCodeEditorViewProxy+Operations.m → .../Xcode/SourceEditorViewProxy+Operations.m b/...de/SourceCodeEditorViewProxy+Operations.m → .../Xcode/SourceEditorViewProxy+Operations.m
@@ -1,5 +1,5 @@
 //
-//  SourceCodeEditorViewProxy+Operations.m
+//  SourceEditorViewProxy+Operations.m
 //  XVim2
 //
 //  Created by Ant on 02/10/2017.
@@ -8,14 +8,14 @@
 
 #import "NSString+VimHelper.h"
 #import "NSTextStorage+VimOperation.h"
-#import "SourceCodeEditorViewProxy+Operations.h"
-#import "SourceCodeEditorViewProxy+Yank.h"
-#import "SourceCodeEditorViewProxy+XVim.h"
+#import "SourceEditorViewProxy+Operations.h"
+#import "SourceEditorViewProxy+Yank.h"
+#import "SourceEditorViewProxy+XVim.h"
 #import "XVim.h"
 #import "XVimMotion.h"
 #import "XVimOptions.h"
 
-@interface SourceCodeEditorViewProxy ()
+@interface SourceEditorViewProxy ()
 @property NSUInteger selectionBegin;
 @property NSUInteger insertionPoint;
 @property NSUInteger preservedColumn;
@@ -34,7 +34,7 @@ - (void)xvim_registerPositionForUndo:(NSUInteger)pos;
 - (NSRange)xvim_currentNumber;
 @end
 
-@implementation SourceCodeEditorViewProxy (Operations)
+@implementation SourceEditorViewProxy (Operations)
 
 #pragma mark - COPYMOVE
 - (void)xvim_copymove:(XVimMotion*)motion withMotionPoint:(NSUInteger)motionPoint withInsertionPoint:(NSUInteger)insertionPoint after:(BOOL)after onlyCopy:(BOOL)onlyCopy{

diff --git a/...ode/SourceCodeEditorViewProxy+Scrolling.h → ...2/Xcode/SourceEditorViewProxy+Scrolling.h b/...ode/SourceCodeEditorViewProxy+Scrolling.h → ...2/Xcode/SourceEditorViewProxy+Scrolling.h
@@ -1,14 +1,14 @@
 //
-//  SourceCodeEditorViewProxy+Scrolling.h
+//  SourceEditorViewProxy+Scrolling.h
 //  XVim2
 //
 //  Created by Ant on 02/10/2017.
 //  Copyright © 2017 Shuichiro Suzuki. All rights reserved.
 //
 
-#import "SourceCodeEditorViewProxy.h"
+#import "SourceEditorViewProxy.h"
 #import <Foundation/Foundation.h>
 
-@interface SourceCodeEditorViewProxy (Scrolling) <SourceViewScrollingProtocol>
+@interface SourceEditorViewProxy (Scrolling) <SourceViewScrollingProtocol>
 @property (readonly) NSInteger linesPerPage;
 @end
diff --git a/...ode/SourceCodeEditorViewProxy+Scrolling.m → ...2/Xcode/SourceEditorViewProxy+Scrolling.m b/...ode/SourceCodeEditorViewProxy+Scrolling.m → ...2/Xcode/SourceEditorViewProxy+Scrolling.m
@@ -8,11 +8,11 @@
 
 #import "NSTextStorage+VimOperation.h"
 #import "SourceViewProtocol.h"
-#import "SourceCodeEditorViewProxy+Scrolling.h"
-#import "SourceCodeEditorViewProxy+XVim.h"
-#import "SourceCodeEditorViewProxy+Yank.h"
+#import "SourceEditorViewProxy+Scrolling.h"
+#import "SourceEditorViewProxy+XVim.h"
+#import "SourceEditorViewProxy+Yank.h"
 
-@interface SourceCodeEditorViewProxy ()
+@interface SourceEditorViewProxy ()
 @property NSUInteger selectionBegin;
 @property NSUInteger insertionPoint;
 @property NSUInteger preservedColumn;
@@ -21,7 +21,7 @@ - (void)xvim_moveCursor:(NSUInteger)pos preserveColumn:(BOOL)preserve;
 - (void)xvim_syncStateWithScroll:(BOOL)scroll;
 @end
 
-@implementation SourceCodeEditorViewProxy (Scrolling)
+@implementation SourceEditorViewProxy (Scrolling)
 
 // This is used by scrollBottom,Top,Center as a common method
 - (void)xvim_scrollCommon_moveCursorPos:(NSUInteger)lineNumber firstNonblank:(BOOL)fnb

diff --git a/XVim2/Xcode/SourceCodeEditorViewProxy+XVim.h → XVim2/Xcode/SourceEditorViewProxy+XVim.h b/XVim2/Xcode/SourceCodeEditorViewProxy+XVim.h → XVim2/Xcode/SourceEditorViewProxy+XVim.h
@@ -6,11 +6,11 @@
 //  Copyright © 2017 Shuichiro Suzuki. All rights reserved.
 //
 
-#import "SourceCodeEditorViewProxy.h"
+#import "SourceEditorViewProxy.h"
 #import "XVimMotionOption.h"
 #import <Foundation/Foundation.h>
 
-@interface SourceCodeEditorViewProxy (XVim)
+@interface SourceEditorViewProxy (XVim)
 - (NSUInteger)xvim_indexOfLineNumber:(NSUInteger)line;
 - (NSUInteger)xvim_indexOfLineNumber:(NSUInteger)line column:(NSUInteger)col;
 - (NSUInteger)xvim_lineNumberAtIndex:(NSUInteger)idx;

diff --git a/XVim2/Xcode/SourceCodeEditorViewProxy+XVim.m → XVim2/Xcode/SourceEditorViewProxy+XVim.m b/XVim2/Xcode/SourceCodeEditorViewProxy+XVim.m → XVim2/Xcode/SourceEditorViewProxy+XVim.m
@@ -10,18 +10,18 @@
 #import <IDEKit/IDEEditorDocument.h>
 #import "NSString+VimHelper.h"
 #import "NSTextStorage+VimOperation.h"
-#import "SourceCodeEditorViewProxy+XVim.h"
-#import "SourceCodeEditorViewProxy.h"
-#import "SourceCodeEditorViewProxy+Scrolling.h"
+#import "SourceEditorViewProxy+XVim.h"
+#import "SourceEditorViewProxy.h"
+#import "SourceEditorViewProxy+Scrolling.h"
 #import "XVim.h"
 #import "XVim2-Swift.h"
 #import "XVimMotion.h"
 #import "XVimOptions.h"
 #import "XVimXcode.h"
 #import <IDESourceEditor/_TtC15IDESourceEditor19IDESourceEditorView.h>
 
-@interface SourceCodeEditorViewProxy ()
-@property (weak) _TtC15IDESourceEditor19IDESourceEditorView* sourceCodeEditorView;
+@interface SourceEditorViewProxy ()
+@property (weak) _TtC15IDESourceEditor19IDESourceEditorView* sourceEditorView;
 @property NSUInteger selectionBegin;
 @property XVIM_VISUAL_MODE selectionMode;
 @property NSUInteger insertionPoint;
@@ -36,7 +36,7 @@ - (void)_xvim_killSelection:(XVimSelection)sel;
 @end
 
 
-@implementation SourceCodeEditorViewProxy (XVim)
+@implementation SourceEditorViewProxy (XVim)
 
 - (NSUInteger)xvim_indexOfLineNumber:(NSUInteger)line column:(NSUInteger)col
 {
@@ -66,7 +66,7 @@ -(NSRange)xvim_indexRangeForLines:(NSRange)lineRange includeEOL:(BOOL)includeEOL
     NSUInteger firstRow = lineRange.location - 1;
     NSUInteger numRows = lineRange.length;
 
-    NSRange charRange = [self.sourceCodeEditorView characterRangeForLineRange:NSMakeRange(firstRow, numRows)];
+    NSRange charRange = [self.sourceEditorView characterRangeForLineRange:NSMakeRange(firstRow, numRows)];
     if (includeEOL) {
         charRange.length += [self.sourceEditorDataSourceWrapper lineTerminatorLengthForLine:(firstRow + numRows - 1)];
     }
@@ -961,25 +961,25 @@ - (void)xvim_escapeFromInsert
 - (NSUInteger)xvim_displayNextLine:(NSUInteger)index column:(NSUInteger)column count:(NSUInteger)count option:(MOTION_OPTION)opt
 {
     for (NSUInteger i = 0; i < count; i++) {
-        [self.sourceCodeEditorView moveDown:self];
+        [self.sourceEditorView moveDown:self];
     }
     // TODO
-    return [self.sourceCodeEditorView
-                       characterRangeForLineRange:NSMakeRange(self.sourceCodeEditorView
+    return [self.sourceEditorView
+                       characterRangeForLineRange:NSMakeRange(self.sourceEditorView
                                                                           .accessibilityInsertionPointLineNumber,
                                                               1)]
                        .location
-           + self.sourceCodeEditorView.accessibilityColumnIndexRange.location;
+           + self.sourceEditorView.accessibilityColumnIndexRange.location;
 }
 
 - (NSUInteger)xvim_displayPrevLine:(NSUInteger)index column:(NSUInteger)column count:(NSUInteger)count option:(MOTION_OPTION)opt
 {
     for (NSUInteger i = 0; i < count; i++) {
-        [self.sourceCodeEditorView moveUp:self];
+        [self.sourceEditorView moveUp:self];
     }
-    NSRange range = self.sourceCodeEditorView.accessibilityColumnIndexRange;
-    return [self.sourceCodeEditorView
-                       characterRangeForLineRange:NSMakeRange(self.sourceCodeEditorView
+    NSRange range = self.sourceEditorView.accessibilityColumnIndexRange;
+    return [self.sourceEditorView
+                       characterRangeForLineRange:NSMakeRange(self.sourceEditorView
                                                                           .accessibilityInsertionPointLineNumber,
                                                               1)]
                        .location
@@ -992,9 +992,9 @@ - (void)xvim_registerPositionForUndo:(NSUInteger)pos
 {
     // XCODE93
     /*
-    __weak SourceCodeEditorViewProxy* weakSelf = self;
+    __weak SourceEditorViewProxy* weakSelf = self;
     [self.undoManager registerUndoWithTarget:self handler:^(id _Nonnull target){
-        SourceCodeEditorViewProxy* SELF = weakSelf;
+        SourceEditorViewProxy* SELF = weakSelf;
         if (!SELF)
             return;
         XVimMotion* m = XVIM_MAKE_MOTION(MOTION_POSITION, DEFAULT_MOTION_TYPE,

diff --git a/XVim2/Xcode/SourceCodeEditorViewProxy+Yank.h → XVim2/Xcode/SourceEditorViewProxy+Yank.h b/XVim2/Xcode/SourceCodeEditorViewProxy+Yank.h → XVim2/Xcode/SourceEditorViewProxy+Yank.h
@@ -6,11 +6,11 @@
 //  Copyright © 2017 Shuichiro Suzuki. All rights reserved.
 //
 
-#import "SourceCodeEditorViewProxy.h"
+#import "SourceEditorViewProxy.h"
 #import "XVimMotionType.h"
 #import <Foundation/Foundation.h>
 
-@interface SourceCodeEditorViewProxy (Yank) <SourceViewYankProtocol>
+@interface SourceEditorViewProxy (Yank) <SourceViewYankProtocol>
 - (void)__xvim_startYankWithType:(MOTION_TYPE)type;
 - (void)_xvim_yankRange:(NSRange)range withType:(MOTION_TYPE)type;
 - (void)_xvim_yankSelection:(XVimSelection)sel;

diff --git a/XVim2/Xcode/SourceCodeEditorViewProxy+Yank.m → XVim2/Xcode/SourceEditorViewProxy+Yank.m b/XVim2/Xcode/SourceCodeEditorViewProxy+Yank.m → XVim2/Xcode/SourceEditorViewProxy+Yank.m
@@ -8,12 +8,12 @@
 
 #import "NSString+VimHelper.h"
 #import "NSTextStorage+VimOperation.h"
-#import "SourceCodeEditorViewProxy+Yank.h"
-#import "SourceCodeEditorViewProxy+XVim.h"
-#import "SourceCodeEditorViewProxy+Operations.h"
+#import "SourceEditorViewProxy+Yank.h"
+#import "SourceEditorViewProxy+XVim.h"
+#import "SourceEditorViewProxy+Operations.h"
 #import "XVimMotion.h"
 
-@interface SourceCodeEditorViewProxy ()
+@interface SourceEditorViewProxy ()
 @property NSUInteger selectionBegin;
 @property NSUInteger insertionPoint;
 @property NSUInteger preservedColumn;
@@ -31,7 +31,7 @@ - (NSRange)xvim_getOperationRangeFrom:(NSUInteger)from To:(NSUInteger)to Type:(M
 - (void)_xvim_insertSpaces:(NSUInteger)count replacementRange:(NSRange)replacementRange;
 @end
 
-@implementation SourceCodeEditorViewProxy (Yank)
+@implementation SourceEditorViewProxy (Yank)
 
 - (NSRange)_xvim_getYankRange:(XVimMotion*)motion withRange:(XVimRange)to
 {

diff --git a/XVim2/Xcode/SourceCodeEditorViewProxy.h → XVim2/Xcode/SourceEditorViewProxy.h b/XVim2/Xcode/SourceCodeEditorViewProxy.h → XVim2/Xcode/SourceEditorViewProxy.h
@@ -67,9 +67,9 @@ static inline XVimSourceEditorRange XvimMakeSourceEditorRange(XVimSourceEditorPo
 // SourceEditorSelection is an internal class
 
 @protocol XVimTextViewDelegateProtocol;
-@class SourceCodeEditorViewWrapper, SourceEditorDataSourceWrapper;
+@class SourceEditorViewWrapper, SourceEditorDataSourceWrapper;
 
-@interface SourceCodeEditorViewProxy : NSObject <SourceViewProtocol>
+@interface SourceEditorViewProxy : NSObject <SourceViewProtocol>
 @property (readonly) XVIM_VISUAL_MODE selectionMode;
 @property (readonly) NSUInteger insertionPoint;
 @property (readonly) XVimPosition insertionPosition;
@@ -89,9 +89,9 @@ static inline XVimSourceEditorRange XvimMakeSourceEditorRange(XVimSourceEditorPo
 @property (readonly, nullable) NSWindow* window;
 @property (strong, nonnull) NSString* string;
 @property BOOL xvim_lockSyncStateFromView;
-@property (strong, nullable) SourceCodeEditorViewWrapper* sourceCodeEditorViewWrapper;
+@property (strong, nullable) SourceEditorViewWrapper* sourceEditorViewWrapper;
 @property (readonly, nonatomic, nullable) SourceEditorDataSourceWrapper* sourceEditorDataSourceWrapper;
-- (nullable instancetype)initWithSourceCodeEditorView:(nonnull _TtC15IDESourceEditor19IDESourceEditorView *)sourceEditorView;
+- (nullable instancetype)initWithSourceEditorView:(nonnull _TtC15IDESourceEditor19IDESourceEditorView *)sourceEditorView;
 
 // Data source
 @property (readonly, nonatomic, nullable) id dataSource;