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

IDEA-84119

Browse Source
This commit is contained in:
Alexey Kudravtsev
2012-04-10 11:57:56 +04:00
parent aec833ce34
commit 76ad799f19
3 changed files with 23 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/copyright/src/com/maddyhome/idea/copyright/psi/AbstractUpdateCopyright.java
+7 -5
View File
@@ -19,6 +19,7 @@ package com.maddyhome.idea.copyright.psi;
import com.intellij.openapi.fileTypes.FileType;
import com.intellij.openapi.module.Module;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.util.text.StringUtil;
import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.psi.PsiManager;
import com.maddyhome.idea.copyright.CopyrightManager;
@@ -49,13 +50,13 @@ public abstract class AbstractUpdateCopyright implements UpdateCopyright {
FileType ftype = FileTypeUtil.getInstance().getFileTypeByFile(root);
LanguageOptions opts = CopyrightManager.getInstance(project).getOptions().getMergedOptions(ftype.getName());
String base = EntityUtil.decode(myCopyrightProfile.getNotice());
if (base.length() > 0) {
String expanded = VelocityHelper.evaluate(manager.findFile(root), project, module, base);
String cmt = FileTypeUtil.buildComment(root.getFileType(), expanded, opts);
commentText = prefix + cmt + suffix;
if (base.isEmpty()) {
commentText = "";
}
else {
commentText = "";
String expanded = VelocityHelper.evaluate(manager.findFile(root), project, module, base);
String cmt = FileTypeUtil.buildComment(root.getFileType(), expanded, opts);
commentText = StringUtil.convertLineSeparators(prefix + cmt + suffix);
}
}
@@ -63,6 +64,7 @@ public abstract class AbstractUpdateCopyright implements UpdateCopyright {
}
@Override
public VirtualFile getRoot() {
return root;
}
plugins/copyright/src/com/maddyhome/idea/copyright/psi/UpdateCopyright.java
+1 -2
View File
@@ -17,13 +17,12 @@
package com.maddyhome.idea.copyright.psi;
import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.util.IncorrectOperationException;
public interface UpdateCopyright
{
void prepare();
void complete() throws IncorrectOperationException, Exception;
void complete() throws Exception;
VirtualFile getRoot();
}
plugins/copyright/src/com/maddyhome/idea/copyright/psi/UpdatePsiFileCopyright.java
+15 -13
View File
@@ -57,6 +57,7 @@ public abstract class UpdatePsiFileCopyright extends AbstractUpdateCopyright {
langOpts = CopyrightManager.getInstance(project).getOptions().getMergedOptions(type.getName());
}
@Override
public void prepare() {
if (file == null) {
logger.info("No file for root: " + getRoot());
@@ -68,7 +69,8 @@ public abstract class UpdatePsiFileCopyright extends AbstractUpdateCopyright {
}
}
public void complete() throws IncorrectOperationException, Exception {
@Override
public void complete() throws Exception {
if (file == null) {
logger.info("No file for root: " + getRoot());
return;
@@ -117,13 +119,13 @@ public abstract class UpdatePsiFileCopyright extends AbstractUpdateCopyright {
String text = comment.getText();
Matcher match = pattern.matcher(text);
if (match.find()) {
found.add(getLineCopyrightComments(comments, doc, i, comment, text));
found.add(getLineCopyrightComments(comments, doc, i, comment));
}
}
// Default insertion point to just before user chosen marker (package, import, class)
PsiElement point = last;
if (commentHere && comments.size() > 0 && langOpts.isRelativeBefore()) {
if (commentHere && !comments.isEmpty() && langOpts.isRelativeBefore()) {
// Insert before first comment within this section of code.
point = comments.get(0);
}
@@ -131,8 +133,8 @@ public abstract class UpdatePsiFileCopyright extends AbstractUpdateCopyright {
if (commentHere && found.size() == 1) {
CommentRange range = found.iterator().next();
// Is the comment in the right place?
if ((langOpts.isRelativeBefore() && range.getFirst() == comments.get(0)) ||
(!langOpts.isRelativeBefore() && range.getLast() == comments.get(comments.size() - 1))) {
if (langOpts.isRelativeBefore() && range.getFirst() == comments.get(0) ||
!langOpts.isRelativeBefore() && range.getLast() == comments.get(comments.size() - 1)) {
// Check to see if current copyright comment matches new one.
String newComment = getCommentText("", "");
resetCommentText();
@@ -147,15 +149,13 @@ public abstract class UpdatePsiFileCopyright extends AbstractUpdateCopyright {
// TODO - do we need option to remove blank line after?
return; // Nothing to do since the comment is the same
}
else {
PsiElement next = getNextSibling(range.getLast());
if (next instanceof PsiWhiteSpace && countNewline(next.getText()) > 1) {
return;
}
PsiElement next = getNextSibling(range.getLast());
if (next instanceof PsiWhiteSpace && countNewline(next.getText()) > 1) {
return;
}
point = range.getFirst();
}
else if (newComment.length() > 0) {
else if (!newComment.isEmpty()) {
int start = range.getFirst().getTextRange().getStartOffset();
int end = range.getLast().getTextRange().getEndOffset();
addAction(new CommentAction(CommentAction.ACTION_REPLACE, start, end));
@@ -247,7 +247,7 @@ public abstract class UpdatePsiFileCopyright extends AbstractUpdateCopyright {
}
}
private static CommentRange getLineCopyrightComments(List<PsiComment> comments, Document doc, int i, PsiComment comment, String text) {
private static CommentRange getLineCopyrightComments(List<PsiComment> comments, Document doc, int i, PsiComment comment) {
PsiElement firstComment = comment;
PsiElement lastComment = comment;
final Commenter commenter = LanguageCommenters.INSTANCE.forLanguage(PsiUtilBase.findLanguageFromElement(comment));
@@ -311,6 +311,7 @@ public abstract class UpdatePsiFileCopyright extends AbstractUpdateCopyright {
protected void processActions() throws IncorrectOperationException {
Application app = ApplicationManager.getApplication();
app.runWriteAction(new Runnable() {
@Override
public void run() {
Document doc = FileDocumentManager.getInstance().getDocument(getRoot());
PsiDocumentManager.getInstance(file.getProject()).doPostponedOperationsAndUnblockDocument(doc);
@@ -321,7 +322,7 @@ public abstract class UpdatePsiFileCopyright extends AbstractUpdateCopyright {
switch (action.getType()) {
case CommentAction.ACTION_INSERT:
String comment = getCommentText(action.getPrefix(), action.getSuffix());
if (comment.length() > 0) {
if (!comment.isEmpty()) {
doc.insertString(start, comment);
}
break;
@@ -414,6 +415,7 @@ public abstract class UpdatePsiFileCopyright extends AbstractUpdateCopyright {
return suffix;
}
@Override
public int compareTo(CommentAction object) {
int s = object.getStart();
int diff = s - start;