coteditor/CotEditor
1
0
Fork 0
mirror of https://github.com/coteditor/CotEditor.git synced 2024-09-11 11:25:57 +03:00
Code Issues Projects Releases Wiki Activity

Improve bracket balancing behavior

Browse Source
This commit is contained in:
1024jp 2016-02-04 20:26:51 +09:00
parent 9a609640bb
commit 2e8a229217
2 changed files with 26 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -11,6 +11,7 @@ develop
- Update Shell Script syntax style:
- Fix variable highlight with `_`.
- [beta] Disable “Balance brackets and quotes” option by default.
- [beta] Don't insert closing bracket if already auto-typed.
- [beta] Update “General” pane layout.

32
CotEditor/Sources/CETextView.m
View File

@ -51,6 +51,7 @@
// constant
static NSString *_Nonnull const CESelectedRangesKey = @"selectedRange";
static NSString *_Nonnull const CEVisibleRectKey = @"visibleRect";
static NSString *_Nonnull const CEAutoBalancedClosingBracketAttributeName = @"autoBalancedClosingBracket";
static const NSInteger kNoMenuItem = -1;
@ -76,7 +77,8 @@ static const NSUInteger kMaxPageGuideColumn = 1000;
@implementation CETextView
static NSPoint kTextContainerOrigin;
static NSCharacterSet *kMatchingBracketsSet;
static NSCharacterSet *kMatchingOpeningBracketsSet;
static NSCharacterSet *kMatchingClosingBracketsSet;
#pragma mark Superclass Methods
@ -93,7 +95,8 @@ static NSCharacterSet *kMatchingBracketsSet;
kTextContainerOrigin = NSMakePoint((CGFloat)[defaults doubleForKey:CEDefaultTextContainerInsetWidthKey],
(CGFloat)[defaults doubleForKey:CEDefaultTextContainerInsetHeightTopKey]);
kMatchingBracketsSet = [NSCharacterSet characterSetWithCharactersInString:@"[{(\""];
kMatchingOpeningBracketsSet = [NSCharacterSet characterSetWithCharactersInString:@"[{(\""];
kMatchingClosingBracketsSet = [NSCharacterSet characterSetWithCharactersInString:@"]})"]; // ignore "
});
}
@ -341,7 +344,7 @@ static NSCharacterSet *kMatchingBracketsSet;
// balance brackets and quotes
if ([defaults boolForKey:CEDefaultBalancesBracketsKey] && (replacementRange.length == 0) &&
[string length] == 1 && [kMatchingBracketsSet characterIsMember:[string characterAtIndex:0]])
[string length] == 1 && [kMatchingOpeningBracketsSet characterIsMember:[string characterAtIndex:0]])
{
// wrap selection with brackets if some text is selected
if ([self selectedRange].length > 0) {
@ -370,9 +373,7 @@ static NSCharacterSet *kMatchingBracketsSet;
}
// check if insertion point is in a word
} else if (!([[NSCharacterSet alphanumericCharacterSet] characterIsMember:[self characterBeforeInsertion]] &&
[[NSCharacterSet alphanumericCharacterSet] characterIsMember:[self characterAfterInsertion]]))
{
} else if (![[NSCharacterSet alphanumericCharacterSet] characterIsMember:[self characterAfterInsertion]]) {
switch ([string characterAtIndex:0]) {
case '[':
string = @"[]";
@ -390,6 +391,23 @@ static NSCharacterSet *kMatchingBracketsSet;
[super insertText:string replacementRange:replacementRange];
[self setSelectedRange:NSMakeRange([self selectedRange].location - 1, 0)];
// set flag
[[self textStorage] addAttribute:CEAutoBalancedClosingBracketAttributeName value:@YES
range:NSMakeRange([self selectedRange].location, 1)];
return;
}
}
// just move cursor if closed bracket is already typed
if ([defaults boolForKey:CEDefaultBalancesBracketsKey] && (replacementRange.length == 0) &&
[kMatchingClosingBracketsSet characterIsMember:[string characterAtIndex:0]] &&
([string characterAtIndex:0] == [self characterAfterInsertion]))
{
if ([[[self textStorage] attribute:CEAutoBalancedClosingBracketAttributeName
atIndex:[self selectedRange].location effectiveRange:NULL] boolValue])
{
[self setSelectedRange:NSMakeRange([self selectedRange].location + 1, 0)];
return;
}
}
@ -565,7 +583,7 @@ static NSCharacterSet *kMatchingBracketsSet;
// balance brackets
if ((selectedRange.length == 0) && [[NSUserDefaults standardUserDefaults] boolForKey:CEDefaultBalancesBracketsKey] &&
(selectedRange.location > 0) && (selectedRange.location < [[self string] length]) &&
[kMatchingBracketsSet characterIsMember:[self characterBeforeInsertion]])
[kMatchingOpeningBracketsSet characterIsMember:[self characterBeforeInsertion]])
{
NSString *surroundingCharacters = [[self string] substringWithRange:NSMakeRange(selectedRange.location - 1, 2)];
if ([surroundingCharacters isEqualToString:@"{}"] ||