azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Create from usage: Removed checking for null before instanceof.

Browse Source
This commit is contained in:
Jack Zhou
2013-05-02 11:03:42 -04:00
parent bdf73c07b8
commit 1a34c71763
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/jet/plugin/quickfix/CreateFunctionFromUsageFix.java
+4 -4
View File
@@ -382,7 +382,7 @@ public class CreateFunctionFromUsageFix extends CreateFromUsageFixBase {
Editor editor = context.getEditor(); Editor editor = context.getEditor();
assert editor != null; assert editor != null;
PsiFile file = PsiDocumentManager.getInstance(project).getPsiFile(editor.getDocument()); PsiFile file = PsiDocumentManager.getInstance(project).getPsiFile(editor.getDocument());
assert file != null && file instanceof JetFile; assert file instanceof JetFile;
PsiElement elementAt = file.findElementAt(offset); PsiElement elementAt = file.findElementAt(offset);
JetFunction func = PsiTreeUtil.getParentOfType(elementAt, JetFunction.class); JetFunction func = PsiTreeUtil.getParentOfType(elementAt, JetFunction.class);
if (func == null) return new LookupElement[0]; if (func == null) return new LookupElement[0];
@@ -502,7 +502,7 @@ public class CreateFunctionFromUsageFix extends CreateFromUsageFixBase {
Editor editor = context.getEditor(); Editor editor = context.getEditor();
assert editor != null; assert editor != null;
PsiFile file = PsiDocumentManager.getInstance(project).getPsiFile(editor.getDocument()); PsiFile file = PsiDocumentManager.getInstance(project).getPsiFile(editor.getDocument());
assert file != null && file instanceof JetFile; assert file instanceof JetFile;
PsiElement elementAt = file.findElementAt(offset); PsiElement elementAt = file.findElementAt(offset);
JetFunction func = PsiTreeUtil.getParentOfType(elementAt, JetFunction.class); JetFunction func = PsiTreeUtil.getParentOfType(elementAt, JetFunction.class);
if (func == null) { if (func == null) {
@@ -604,7 +604,7 @@ public class CreateFunctionFromUsageFix extends CreateFromUsageFixBase {
@Override @Override
public void invoke(@NotNull final Project project, Editor editor, PsiFile file) throws IncorrectOperationException { public void invoke(@NotNull final Project project, Editor editor, PsiFile file) throws IncorrectOperationException {
assert file != null && file instanceof JetFile; assert file instanceof JetFile;
currentFile = (JetFile) file; currentFile = (JetFile) file;
currentFileEditor = editor; currentFileEditor = editor;
currentFileContext = AnalyzerFacadeWithCache.analyzeFileWithCache(currentFile).getBindingContext(); currentFileContext = AnalyzerFacadeWithCache.analyzeFileWithCache(currentFile).getBindingContext();
@@ -656,7 +656,7 @@ public class CreateFunctionFromUsageFix extends CreateFromUsageFixBase {
ownerClassDescriptor = DescriptorUtils.getClassDescriptorForType(selectedReceiverType.getType()); ownerClassDescriptor = DescriptorUtils.getClassDescriptorForType(selectedReceiverType.getType());
JetType receiverType = ownerClassDescriptor.getDefaultType(); JetType receiverType = ownerClassDescriptor.getDefaultType();
PsiElement classDeclaration = BindingContextUtils.classDescriptorToDeclaration(currentFileContext, ownerClassDescriptor); PsiElement classDeclaration = BindingContextUtils.classDescriptorToDeclaration(currentFileContext, ownerClassDescriptor);
if (classDeclaration != null && classDeclaration instanceof JetClass) { if (classDeclaration instanceof JetClass) {
ownerClass = (JetClass) classDeclaration; ownerClass = (JetClass) classDeclaration;
isExtension = !ownerClass.isWritable(); isExtension = !ownerClass.isWritable();
} else { } else {