Skip to content

select inner content first #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
undoZen wants to merge 2 commits into
base: master
Choose a base branch
from
Open

select inner content first #3

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d31b337
fix braceInfo.numUnclosedOpenBraces bug
undoZen Jun 13, 2013
c707be7
select inner content first
undoZen Jun 13, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 27 additions & 16 deletions SelectParent.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,9 @@ define(function (require, exports, module) {
ctx = TokenUtils.getInitialContext(editor._codeMirror, sel.start);
while (ctx.pos.line < sel.end.line || (ctx.pos.line === sel.end.line && ctx.pos.ch <= sel.end.ch)) {
TokenUtils.moveNextToken(ctx);
if (ctx.pos.line === sel.end.line && ctx.pos.ch > sel.end.ch) {
break;
}
if (ctx.token.string === "{") {
nest++;
} else if (ctx.token.string === "}") {
Expand All @@ -97,18 +100,26 @@ define(function (require, exports, module) {
var sel = editor.getSelection(),
origSel = cloneSelection(sel),
ctx = TokenUtils.getInitialContext(editor._codeMirror, sel.start),
ctxe = TokenUtils.getInitialContext(editor._codeMirror, sel.end),
start,
end,
nest,
braceInfo = numMismatchedBraces(editor, sel);

TokenUtils.moveNextToken(ctxe);

// Search backward for the next outer open brace, skipping open braces that match end braces
// in the selection.
nest = braceInfo.numUnopenedCloseBraces;
do {
if (ctx.token.string === "{") {
if (nest === 0) {
start = nudgeBackward(editor, ctx.pos);
if (ctxe.token.string === "}") {
start = nudgeBackward(editor, ctx.pos);
end = ctxe.pos;
} else {
start = ctx.pos;
}
break;
} else {
nest--;
Expand All @@ -120,21 +131,21 @@ define(function (require, exports, module) {

// Search forward for the next outer close brace, skipping close braces that match open braces
// in the selection.
ctx = TokenUtils.getInitialContext(editor._codeMirror, sel.end);
TokenUtils.moveNextToken(ctx);
nest = braceInfo.numUnclosedOpenBraces;
do {
if (ctx.token.string === "}") {
if (nest === 0) {
end = ctx.pos;
break;
} else {
nest--;
}
} else if (ctx.token.string === "{") {
nest++;
}
} while (TokenUtils.moveNextToken(ctx));
if (!end) {
nest = braceInfo.numUnclosedOpenBraces;
do {
if (ctxe.token.string === "}") {
if (nest === 0) {
end = nudgeBackward(editor, ctxe.pos);
break;
} else {
nest--;
}
} else if (ctxe.token.string === "{") {
nest++;
}
} while (TokenUtils.moveNextToken(ctxe));
}
if (start && end) {
ignoreNextSel = true;
selectStack.push({start: origSel.start, end: origSel.end});
Expand Down