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

Fix warnings

Browse Source
This commit is contained in:
Alexey Sedunov
2014-01-30 14:59:12 +04:00
parent ec4c83dc91
commit ac984b0566
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/jet/plugin/refactoring/introduceVariable/JetIntroduceVariableHandler.java
+5 -3
View File
@@ -253,7 +253,6 @@ public class JetIntroduceVariableHandler extends JetIntroduceHandlerBase {
variableText += expression.getText(); variableText += expression.getText();
} }
JetProperty property = JetPsiFactory.createProperty(project, variableText); JetProperty property = JetPsiFactory.createProperty(project, variableText);
if (property == null) return;
PsiElement anchor = calculateAnchor(commonParent, commonContainer, allReplaces); PsiElement anchor = calculateAnchor(commonParent, commonContainer, allReplaces);
if (anchor == null) return; if (anchor == null) return;
boolean needBraces = !(commonContainer instanceof JetBlockExpression || boolean needBraces = !(commonContainer instanceof JetBlockExpression ||
@@ -347,7 +346,10 @@ public class JetIntroduceVariableHandler extends JetIntroduceHandlerBase {
if (!function.hasDeclaredReturnType()) { if (!function.hasDeclaredReturnType()) {
//todo: add return type //todo: add return type
} }
function.getEqualsToken().delete();
PsiElement equalsToken = function.getEqualsToken();
assert equalsToken != null : "Function without block body was expected: " + function.getText();
equalsToken.delete();
} }
else if (commonContainer instanceof JetContainerNode) { else if (commonContainer instanceof JetContainerNode) {
JetContainerNode node = (JetContainerNode)commonContainer; JetContainerNode node = (JetContainerNode)commonContainer;
@@ -443,7 +445,7 @@ public class JetIntroduceVariableHandler extends JetIntroduceHandlerBase {
public void visitExpression(@NotNull JetExpression expression) { public void visitExpression(@NotNull JetExpression expression) {
if (PsiEquivalenceUtil.areElementsEquivalent(expression, actualExpression, null, new Comparator<PsiElement>() { if (PsiEquivalenceUtil.areElementsEquivalent(expression, actualExpression, null, new Comparator<PsiElement>() {
@Override @Override
public int compare(PsiElement element1, PsiElement element2) { public int compare(@NotNull PsiElement element1, @NotNull PsiElement element2) {
if (element1.getNode().getElementType() == JetTokens.IDENTIFIER && if (element1.getNode().getElementType() == JetTokens.IDENTIFIER &&
element2.getNode().getElementType() == JetTokens.IDENTIFIER) { element2.getNode().getElementType() == JetTokens.IDENTIFIER) {
if (element1.getParent() instanceof JetSimpleNameExpression && if (element1.getParent() instanceof JetSimpleNameExpression &&