MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

json enter handling: check ranges

Browse Source
This commit is contained in:
Anton Lobov
2018-05-07 18:43:58 +02:00
parent abc458bb0e
commit f7de93b3a9
1 changed files with 22 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
json/src/com/intellij/json/editor/JsonEnterHandler.java
+22 -9
View File
@@ -8,6 +8,7 @@ import com.intellij.json.JsonLanguage;
import com.intellij.json.psi.*;
import com.intellij.lang.Language;
import com.intellij.openapi.actionSystem.DataContext;
import com.intellij.openapi.editor.Document;
import com.intellij.openapi.editor.Editor;
import com.intellij.openapi.editor.actionSystem.EditorActionHandler;
import com.intellij.openapi.util.Ref;
@@ -68,11 +69,13 @@ public class JsonEnterHandler extends EnterHandlerDelegateAdapter {
if (prevSibling instanceof JsonProperty && ((JsonProperty)prevSibling).getValue() != null) {
int offset = elementType == JsonElementTypes.COMMA ? nextSibling.getTextRange().getEndOffset() : prevSibling.getTextRange().getEndOffset();
if (elementType == JsonElementTypes.R_CURLY) {
editor.getDocument().insertString(offset, ",");
offset++;
if (offset < editor.getDocument().getTextLength()) {
if (elementType == JsonElementTypes.R_CURLY) {
editor.getDocument().insertString(offset, ",");
offset++;
}
caretOffsetRef.set(offset);
}
caretOffsetRef.set(offset);
return true;
}
return false;
@@ -86,8 +89,10 @@ public class JsonEnterHandler extends EnterHandlerDelegateAdapter {
if (prevSibling instanceof JsonProperty) {
int offset = prevSibling.getTextRange().getEndOffset();
editor.getDocument().insertString(offset, ",");
caretOffsetRef.set(offset + 1);
if (offset < editor.getDocument().getTextLength()) {
editor.getDocument().insertString(offset, ",");
caretOffsetRef.set(offset + 1);
}
return true;
}
}
@@ -113,7 +118,10 @@ public class JsonEnterHandler extends EnterHandlerDelegateAdapter {
|| !(nextSibling instanceof JsonProperty)) {
return;
}
editor.getDocument().insertString(offset, ",");
Document document = editor.getDocument();
if (offset < document.getTextLength()) {
document.insertString(offset, ",");
}
return;
}
@@ -121,10 +129,15 @@ public class JsonEnterHandler extends EnterHandlerDelegateAdapter {
offset = nextSibling.getTextRange().getEndOffset();
}
else {
editor.getDocument().insertString(offset, ",");
Document document = editor.getDocument();
if (offset < document.getTextLength()) {
document.insertString(offset, ",");
}
offset++;
}
caretOffsetRef.set(offset);
if (offset < editor.getDocument().getTextLength()) {
caretOffsetRef.set(offset);
}
}
}