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

EA-32874 - NPE: SaveAsTemplateAction$$.run (cherry picked from commit c432ab8)

Browse Source
This commit is contained in:
anna
2012-03-21 18:02:08 +01:00
parent b8ef86a111
commit 56abb5d4aa
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/codeInsight/template/actions/SaveAsTemplateAction.java
+6 -1
View File
@@ -31,6 +31,7 @@ import com.intellij.openapi.application.AccessToken;
import com.intellij.openapi.application.ApplicationManager;
import com.intellij.openapi.application.WriteAction;
import com.intellij.openapi.command.CommandProcessor;
import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.editor.Document;
import com.intellij.openapi.editor.Editor;
import com.intellij.openapi.editor.EditorFactory;
@@ -48,6 +49,8 @@ import java.util.Set;
public class SaveAsTemplateAction extends AnAction {
private static final Logger LOG = Logger.getInstance("#" + SaveAsTemplateAction.class.getName());
public void actionPerformed(AnActionEvent e) {
DataContext dataContext = e.getDataContext();
final Editor editor = PlatformDataKeys.EDITOR.getData(dataContext);
@@ -89,7 +92,9 @@ public class SaveAsTemplateAction extends AnAction {
if (!(reference instanceof PsiQualifiedReference) || ((PsiQualifiedReference) reference).getQualifier() == null) {
String canonicalText = reference.getCanonicalText();
TextRange referenceRange = reference.getRangeInElement();
TextRange range = element.getTextRange().cutOut(referenceRange).shiftRight(-offsetDelta);
final TextRange elementTextRange = element.getTextRange();
LOG.assertTrue(elementTextRange != null, elementTextRange);
final TextRange range = elementTextRange.cutOut(referenceRange).shiftRight(-offsetDelta);
final String oldText = document.getText(range);
// workaround for Java references: canonicalText contains generics, and we need to cut them off because otherwise
// they will be duplicated