Fixed isInCode and code block textcomplete might not correct

This commit is contained in:
Cheng-Han, Wu 2016-02-01 00:42:30 -06:00
parent 1fb42bd276
commit ce8f9b695c

View file

@ -2191,7 +2191,7 @@ function checkCursorMenu() {
var isInCode = false; var isInCode = false;
function checkInCode() { function checkInCode() {
isInCode = checkAbove() && checkBelow(); isInCode = checkAbove();
} }
function checkAbove() { function checkAbove() {
@ -2208,9 +2208,9 @@ function checkBelow() {
var cursor = editor.getCursor(); var cursor = editor.getCursor();
var count = editor.lineCount(); var count = editor.lineCount();
var text = []; var text = [];
for (var i = cursor.line + 1; i < count; i++) //not contain current line for (var i = cursor.line + 1; i < count; i++) //contain current line
text.push(editor.getLine(i)); text.push(editor.getLine(i));
text = text.join('\n') + '\n' + editor.getLine(cursor.line).slice(0, cursor.ch); text = editor.getLine(cursor.line).slice(cursor.ch) + '\n' + text.join('\n');
//console.log(text); //console.log(text);
return matchInCode(text); return matchInCode(text);
} }
@ -2279,7 +2279,7 @@ $(editor.getInputField())
}, },
replace: function (lang) { replace: function (lang) {
var ending = ''; var ending = '';
if (isInCode) { if (!checkBelow()) {
ending = '\n\n```'; ending = '\n\n```';
} }
if (this.langs.indexOf(lang) !== -1) if (this.langs.indexOf(lang) !== -1)
@ -2299,7 +2299,7 @@ $(editor.getInputField())
}, },
context: function (text) { context: function (text) {
checkCursorMenu(); checkCursorMenu();
return true; return isInCode;
} }
}, },
{ //header { //header