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

WEB-7136 Emmet(sass): incorrect caret position after expand the abbreviation

Browse Source 
WEB-7139 Emmet(sass): expanding abbreviation inserts a new empty line
This commit is contained in:
Alexander Zolotov
2013-03-15 16:56:35 +04:00
parent d6cebfb57c
commit aaeec42e39
2 changed files with 23 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
xml/impl/src/com/intellij/codeInsight/template/emmet/ZenCodingTemplate.java
+4
View File
@@ -197,6 +197,10 @@ public class ZenCodingTemplate implements CustomLiveTemplate {
GenerationNode genNode = genNodes.get(i);
TemplateImpl template = genNode.generate(callback, generator, filters, true);
int e = builder.insertTemplate(builder.length(), template, null);
if (i < genNodesSize - 1 && genNode.isInsertNewLineBetweenNodes()) {
builder.insertText(e, "\n", false);
e++;
}
if (end == -1 && end < builder.length()) {
end = e;
}
xml/impl/src/com/intellij/codeInsight/template/emmet/nodes/GenerationNode.java
+19 -7
View File
@@ -32,6 +32,7 @@ import com.intellij.openapi.fileTypes.StdFileTypes;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.util.Pair;
import com.intellij.openapi.util.UserDataHolderBase;
import com.intellij.openapi.util.text.StringUtil;
import com.intellij.psi.PsiElement;
import com.intellij.psi.PsiFile;
import com.intellij.psi.PsiFileFactory;
@@ -61,24 +62,39 @@ public class GenerationNode extends UserDataHolderBase {
private final int myTotalIterations;
private String mySurroundedText;
private final boolean myInsertSurroundedTextAtTheEnd;
private GenerationNode myParent;
private final boolean myInsertNewLineBetweenNodes;
private GenerationNode myParent;
private boolean myContainsSurroundedTextMarker = false;
public GenerationNode(TemplateToken templateToken,
int numberInIteration,
int totalIterations, String surroundedText,
boolean insertSurroundedTextAtTheEnd, GenerationNode parent) {
this(templateToken, numberInIteration, totalIterations, surroundedText, insertSurroundedTextAtTheEnd, parent, false);
}
public GenerationNode(TemplateToken templateToken,
int numberInIteration,
int totalIterations, String surroundedText,
boolean insertSurroundedTextAtTheEnd, GenerationNode parent, boolean insertNewLineBetweenNodes) {
myTemplateToken = templateToken;
myNumberInIteration = numberInIteration;
myTotalIterations = totalIterations;
mySurroundedText = surroundedText;
myInsertSurroundedTextAtTheEnd = insertSurroundedTextAtTheEnd;
myInsertNewLineBetweenNodes = insertNewLineBetweenNodes;
if(parent != null) {
parent.addChild(this);
}
}
public boolean isInsertNewLineBetweenNodes() {
return myInsertNewLineBetweenNodes;
}
public List<GenerationNode> getChildren() {
return myChildren;
}
@@ -181,12 +197,8 @@ public class GenerationNode extends UserDataHolderBase {
indentStr = "\t";
}
else {
StringBuilder tab = new StringBuilder();
int tabSize = settings.getTabSize(callback.getFileType());
while (tabSize-- > 0) {
tab.append(' ');
}
indentStr = tab.toString();
indentStr = StringUtil.repeatSymbol(' ', tabSize);
}
for (int i = 0, myChildrenSize = myChildren.size(); i < myChildrenSize; i++) {
@@ -203,7 +215,7 @@ public class GenerationNode extends UserDataHolderBase {
int e = builder.insertTemplate(offset, childTemplate, null);
offset = marker != null ? marker.getEndOffset() : builder.length();
if (!singleLineFilterEnabled && blockTag && !isNewLineAfter(builder.getText(), offset)) {
if (!singleLineFilterEnabled && ((blockTag && !isNewLineAfter(builder.getText(), offset)) || myInsertNewLineBetweenNodes)) {
builder.insertText(offset, "\n" + indentStr, false);
offset += indentStr.length() + 1;
}