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

else on the next line

Browse Source 
as requested by http://confluence.jetbrains.net/display/JET/Code+Conventions+for+Java

(sed is your friend)
This commit is contained in:
Stepan Koltsov
2012-04-10 00:03:13 +04:00
parent 0d8088268a
commit a889e29147
91 changed files with 578 additions and 289 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/jet/plugin/JetFoldingBuilder.java
+2 -1
View File
@@ -50,7 +50,8 @@ public class JetFoldingBuilder extends FoldingBuilderEx implements DumbAware {
if ((type == JetNodeTypes.BLOCK || type == JetNodeTypes.CLASS_BODY) &&
!isOneLine(textRange, document)) {
descriptors.add(new FoldingDescriptor(node, textRange));
} else if (node.getElementType() == JetTokens.IDE_TEMPLATE_START) {
}
else if (node.getElementType() == JetTokens.IDE_TEMPLATE_START) {
ASTNode next = node.getTreeNext();
if (next != null) {
ASTNode nextNext = next.getTreeNext();
idea/src/org/jetbrains/jet/plugin/JetIconProvider.java
+2 -1
View File
@@ -49,7 +49,8 @@ public class JetIconProvider extends IconProvider {
for (JetDeclaration declaration : declarations) {
if (mostImportantClass == null && declaration instanceof JetClassOrObject) {
mostImportantClass = (JetClassOrObject) declaration;
} else if (declaration instanceof JetClassOrObject) {
}
else if (declaration instanceof JetClassOrObject) {
JetClassOrObject object = (JetClassOrObject) declaration;
if (nameWithoutExtension.equals(object.getName())) {
mostImportantClass = object;
idea/src/org/jetbrains/jet/plugin/completion/DescriptorLookupConverter.java
+2 -1
View File
@@ -78,7 +78,8 @@ public final class DescriptorLookupConverter {
// TODO: Support omitting brackets for one argument functions
if (functionDescriptor.getValueParameters().isEmpty()) {
element = element.setInsertHandler(EMPTY_FUNCTION_HANDLER);
} else {
}
else {
element = element.setInsertHandler(PARAMS_FUNCTION_HANDLER);
}
}
idea/src/org/jetbrains/jet/plugin/completion/JetKeywordCompletionContributor.java
+2 -1
View File
@@ -339,7 +339,8 @@ public class JetKeywordCompletionContributor extends CompletionContributor {
if (notIdentifier) {
return PlatformPatterns.psiElement().and(
new FilterPattern(new AndFilter(GENERAL_FILTER, NOT_IDENTIFIER_FILTER, placeFilter)));
} else {
}
else {
return PlatformPatterns.psiElement().and(
new FilterPattern(new AndFilter(GENERAL_FILTER, placeFilter)));
}
idea/src/org/jetbrains/jet/plugin/completion/JetTemplateParameterTraversalPolicy.java
+2 -1
View File
@@ -76,7 +76,8 @@ public class JetTemplateParameterTraversalPolicy implements TemplateParameterTra
return PsiTreeUtil.firstChild(root);
}
return nextLeaf;
} else {
}
else {
PsiElement prevLeaf = PsiTreeUtil.prevLeaf(element);
if (prevLeaf == null) {
PsiElement root = PsiTreeUtil.getTopmostParentOfType(element, JetFile.class);
idea/src/org/jetbrains/jet/plugin/completion/handlers/JetFunctionInsertHandler.java
+4 -2
View File
@@ -91,7 +91,8 @@ public class JetFunctionInsertHandler implements InsertHandler<LookupElement> {
// Insert () if it's not already exist
document.insertString(endOffset, "()");
bothParentheses = true;
} else if (endOffset + 1 < documentText.length() && documentText.charAt(endOffset + 1) == ')') {
}
else if (endOffset + 1 < documentText.length() && documentText.charAt(endOffset + 1) == ')') {
bothParentheses = true;
}
@@ -99,7 +100,8 @@ public class JetFunctionInsertHandler implements InsertHandler<LookupElement> {
if (caretPosition == CaretPosition.IN_BRACKETS || !bothParentheses) {
editor.getCaretModel().moveToOffset(editor.getCaretModel().getOffset() + 1);
AutoPopupController.getInstance(context.getProject()).autoPopupParameterInfo(editor, offsetElement);
} else {
}
else {
editor.getCaretModel().moveToOffset(editor.getCaretModel().getOffset() + 2);
}
idea/src/org/jetbrains/jet/plugin/editor/KotlinQuoteHandler.java
+2 -1
View File
@@ -35,7 +35,8 @@ public class KotlinQuoteHandler implements QuoteHandler {
int start = iterator.getStart();
int end = iterator.getEnd();
return end - start >= 1 && offset == end - 1;
} else if (tokenType == JetTokens.CLOSING_QUOTE) {
}
else if (tokenType == JetTokens.CLOSING_QUOTE) {
return true;
}
return false;
idea/src/org/jetbrains/jet/plugin/highlighter/PropertiesHighlightingVisitor.java
+2 -1
View File
@@ -84,7 +84,8 @@ class PropertiesHighlightingVisitor extends AfterAnalysisHighlightingVisitor {
boolean namespace = descriptor.getContainingDeclaration() instanceof NamespaceDescriptor;
if (descriptor.getReceiverParameter() != ReceiverDescriptor.NO_RECEIVER) {
JetPsiChecker.highlightName(holder, elementToHighlight, JetHighlightingColors.EXTENSION_PROPERTY);
} else {
}
else {
JetPsiChecker.highlightName(holder, elementToHighlight,
namespace ? JetHighlightingColors.NAMESPACE_PROPERTY : JetHighlightingColors.INSTANCE_PROPERTY
);
idea/src/org/jetbrains/jet/plugin/highlighter/TypeKindHighlightingVisitor.java
+6 -3
View File
@@ -54,7 +54,8 @@ class TypeKindHighlightingVisitor extends HighlightingVisitor {
PsiElement target = ref.resolve();
if (target instanceof JetClass) {
highlightClassByKind((JetClass)target, expression);
} else if (target instanceof JetTypeParameter) {
}
else if (target instanceof JetTypeParameter) {
JetPsiChecker.highlightName(holder, expression, JetHighlightingColors.TYPE_PARAMETER);
}
}
@@ -90,12 +91,14 @@ class TypeKindHighlightingVisitor extends HighlightingVisitor {
TextAttributesKey textAttributes = JetHighlightingColors.CLASS;
if (klass.isTrait()) {
textAttributes = JetHighlightingColors.TRAIT;
} else {
}
else {
JetModifierList modifierList = klass.getModifierList();
if (modifierList != null) {
if (modifierList.hasModifier(JetTokens.ANNOTATION_KEYWORD)) {
textAttributes = JetHighlightingColors.ANNOTATION;
} else if (modifierList.hasModifier(JetTokens.ABSTRACT_KEYWORD)) {
}
else if (modifierList.hasModifier(JetTokens.ABSTRACT_KEYWORD)) {
textAttributes = JetHighlightingColors.ABSTRACT_CLASS;
}
}
idea/src/org/jetbrains/jet/plugin/libraries/DeclarationDescriptorComparator.java
+6 -3
View File
@@ -30,13 +30,16 @@ class DeclarationDescriptorComparator implements Comparator<DeclarationDescripto
private static int getDeclarationPriority(DeclarationDescriptor descriptor) {
if (descriptor instanceof ClassDescriptor) {
return 4;
} else if (descriptor instanceof PropertyDescriptor) {
}
else if (descriptor instanceof PropertyDescriptor) {
return 3;
} else if (descriptor instanceof FunctionDescriptor) {
}
else if (descriptor instanceof FunctionDescriptor) {
FunctionDescriptor fun = (FunctionDescriptor)descriptor;
if (fun.getReceiverParameter() == ReceiverDescriptor.NO_RECEIVER) {
return 2;
} else {
}
else {
return 1;
}
}
idea/src/org/jetbrains/jet/plugin/libraries/DecompiledDataFactory.java
+8 -4
View File
@@ -96,7 +96,8 @@ class DecompiledDataFactory {
myBuilder.append("\n");
}
}
} else {
}
else {
ClassDescriptor cd = myJavaDescriptorResolver.resolveClass(new FqName(psiClass.getQualifiedName()), DescriptorSearchRule.INCLUDE_KOTLIN);
if (cd != null) {
appendDescriptor(cd, "");
@@ -135,13 +136,15 @@ class DecompiledDataFactory {
if (descriptor instanceof FunctionDescriptor) {
myBuilder.append(" { ").append(DECOMPILED_COMMENT).append(" }");
endOffset = myBuilder.length();
} else { // descriptor instanceof PropertyDescriptor
}
else { // descriptor instanceof PropertyDescriptor
if (((PropertyDescriptor) descriptor).getModality() != Modality.ABSTRACT) {
myBuilder.append(" ").append(DECOMPILED_COMMENT);
}
}
}
} else if (descriptor instanceof ClassDescriptor) {
}
else if (descriptor instanceof ClassDescriptor) {
myBuilder.append(" {\n");
ClassDescriptor classDescriptor = (ClassDescriptor) descriptor;
boolean firstPassed = false;
@@ -161,7 +164,8 @@ class DecompiledDataFactory {
if (firstPassed) {
myBuilder.append("\n");
} else {
}
else {
firstPassed = true;
}
myBuilder.append(subindent);
idea/src/org/jetbrains/jet/plugin/libraries/JetSourceNavigationHelper.java
+2 -1
View File
@@ -163,7 +163,8 @@ public class JetSourceNavigationHelper {
}
}
}
} else {
}
else {
// extension property
String expectedTypeString = receiverType.getText();
for (Descr candidate : matcher.getCandidatesFromScope(namespaceDescriptor.getMemberScope(), entityName)) {
idea/src/org/jetbrains/jet/plugin/liveTemplates/JetTemplateContextType.java
+2 -1
View File
@@ -62,7 +62,8 @@ public abstract class JetTemplateContextType extends TemplateContextType {
if (qualifiedExpression != null && qualifiedExpression.getSelectorExpression() == parentOfParent) {
return false;
}
} else {
}
else {
return false;
}
}
idea/src/org/jetbrains/jet/plugin/parameterInfo/JetFunctionParameterInfoHandler.java
+12 -6
View File
@@ -207,7 +207,8 @@ public class JetFunctionParameterInfoHandler implements
JetSimpleNameExpression refExpression = null;
if (calleeExpression instanceof JetSimpleNameExpression) {
refExpression = (JetSimpleNameExpression) calleeExpression;
} else if (calleeExpression instanceof JetConstructorCalleeExpression) {
}
else if (calleeExpression instanceof JetConstructorCalleeExpression) {
JetConstructorCalleeExpression constructorCalleeExpression = (JetConstructorCalleeExpression) calleeExpression;
if (constructorCalleeExpression.getConstructorReferenceExpression() instanceof JetSimpleNameExpression) {
refExpression = (JetSimpleNameExpression) constructorCalleeExpression.getConstructorReferenceExpression();
@@ -244,7 +245,8 @@ public class JetFunctionParameterInfoHandler implements
JetValueArgument argument = valueArguments.get(i);
if (argument.isNamed()) {
namedMode = true;
} else {
}
else {
ValueParameterDescriptor param = valueParameters.get(i);
builder.append(renderParameter(param, false, bindingContext));
if (i < currentParameterIndex) {
@@ -258,7 +260,8 @@ public class JetFunctionParameterInfoHandler implements
}
usedIndexes[i] = true;
}
} else {
}
else {
ValueParameterDescriptor param = valueParameters.get(i);
builder.append(renderParameter(param, false, bindingContext));
}
@@ -309,7 +312,8 @@ public class JetFunctionParameterInfoHandler implements
if (builder.toString().isEmpty()) context.setUIComponentEnabled(false);
else context.setupUIComponentPresentation(builder.toString(), boldStartOffset, boldEndOffset, isGrey,
isDeprecated, false, color);
} else context.setUIComponentEnabled(false);
}
else context.setUIComponentEnabled(false);
}
}
@@ -336,7 +340,8 @@ public class JetFunctionParameterInfoHandler implements
JetSimpleNameExpression refExpression = null;
if (calleeExpression instanceof JetSimpleNameExpression) {
refExpression = (JetSimpleNameExpression) calleeExpression;
} else if (calleeExpression instanceof JetConstructorCalleeExpression) {
}
else if (calleeExpression instanceof JetConstructorCalleeExpression) {
JetConstructorCalleeExpression constructorCalleeExpression = (JetConstructorCalleeExpression) calleeExpression;
if (constructorCalleeExpression.getConstructorReferenceExpression() instanceof JetSimpleNameExpression) {
refExpression = (JetSimpleNameExpression) constructorCalleeExpression.getConstructorReferenceExpression();
@@ -361,7 +366,8 @@ public class JetFunctionParameterInfoHandler implements
if (placeDescriptor != null && !JetVisibilityChecker.isVisible(placeDescriptor, functionDescriptor)) continue;
itemsToShow.add(functionDescriptor);
}
} else if (variant instanceof ClassDescriptor) {
}
else if (variant instanceof ClassDescriptor) {
ClassDescriptor classDescriptor = (ClassDescriptor) variant;
if (classDescriptor.getName().equals(refName)) {
//todo: renamed classes?
idea/src/org/jetbrains/jet/plugin/projectView/JetDeclarationTreeNode.java
+2 -1
View File
@@ -68,7 +68,8 @@ public class JetDeclarationTreeNode extends AbstractPsiBasedNode<JetDeclaration>
text = "<class initializer>";
}
data.setPresentableText(text);
} else {
}
else {
String text = declaration.getName();
if (declaration instanceof JetClassInitializer) {
text = "<class initializer>";
idea/src/org/jetbrains/jet/plugin/projectView/JetFileTreeNode.java
+2 -1
View File
@@ -50,7 +50,8 @@ public class JetFileTreeNode extends PsiFileNode {
for (JetDeclaration declaration : declarations) {
if (declaration instanceof JetClassOrObject) {
result.add(new JetClassOrObjectTreeNode(file.getProject(), (JetClassOrObject) declaration, getSettings()));
} else if (getSettings().isShowMembers()) {
}
else if (getSettings().isShowMembers()) {
result.add(new JetDeclarationTreeNode(getProject(), declaration, getSettings()));
}
}
idea/src/org/jetbrains/jet/plugin/projectView/JetProjectViewProvider.java
+12 -6
View File
@@ -68,10 +68,12 @@ public class JetProjectViewProvider implements SelectableTreeStructureProvider,
if (classDeclarations.size() == 1 && (!settings.isShowMembers() || declarations.size() == 1) &&
nameWithoutExtension.equals(classDeclarations.get(0).getName())) {
result.add(new JetClassOrObjectTreeNode(file.getProject(), classDeclarations.get(0), settings));
} else {
}
else {
result.add(new JetFileTreeNode(file.getProject(), file, settings));
}
} else {
}
else {
result.add(child);
}
@@ -117,13 +119,17 @@ public class JetProjectViewProvider implements SelectableTreeStructureProvider,
PsiElement parent = element.getParent();
if (parent instanceof JetFile) {
return true;
} else if (parent instanceof JetClassBody) {
}
else if (parent instanceof JetClassBody) {
parent = parent.getParent();
if (parent instanceof JetClassOrObject) {
return isSelectable(parent);
} else return false;
} else return false;
} else return false;
}
else return false;
}
else return false;
}
else return false;
}
private boolean fileInRoots(VirtualFile file) {
idea/src/org/jetbrains/jet/plugin/refactoring/JetNameSuggester.java
+48 -24
View File
@@ -86,55 +86,75 @@ public class JetNameSuggester {
if (ErrorUtils.containsErrorType(jetType)) return;
if (typeChecker.equalTypes(standardLibrary.getBooleanType(), jetType)) {
addName(result, "b", validator);
} else if (typeChecker.equalTypes(standardLibrary.getIntType(), jetType)) {
}
else if (typeChecker.equalTypes(standardLibrary.getIntType(), jetType)) {
addName(result, "i", validator);
} else if (typeChecker.equalTypes(standardLibrary.getByteType(), jetType)) {
}
else if (typeChecker.equalTypes(standardLibrary.getByteType(), jetType)) {
addName(result, "byte", validator);
} else if (typeChecker.equalTypes(standardLibrary.getLongType(), jetType)) {
}
else if (typeChecker.equalTypes(standardLibrary.getLongType(), jetType)) {
addName(result, "l", validator);
} else if (typeChecker.equalTypes(standardLibrary.getFloatType(), jetType)) {
}
else if (typeChecker.equalTypes(standardLibrary.getFloatType(), jetType)) {
addName(result, "fl", validator);
} else if (typeChecker.equalTypes(standardLibrary.getDoubleType(), jetType)) {
}
else if (typeChecker.equalTypes(standardLibrary.getDoubleType(), jetType)) {
addName(result, "d", validator);
} else if (typeChecker.equalTypes(standardLibrary.getShortType(), jetType)) {
}
else if (typeChecker.equalTypes(standardLibrary.getShortType(), jetType)) {
addName(result, "sh", validator);
} else if (typeChecker.equalTypes(standardLibrary.getCharType(), jetType)) {
}
else if (typeChecker.equalTypes(standardLibrary.getCharType(), jetType)) {
addName(result, "c", validator);
} else if (typeChecker.equalTypes(standardLibrary.getStringType(), jetType)) {
}
else if (typeChecker.equalTypes(standardLibrary.getStringType(), jetType)) {
addName(result, "s", validator);
} else {
}
else {
if (jetType.getArguments().size() == 1) {
JetType argument = jetType.getArguments().get(0).getType();
if (typeChecker.equalTypes(standardLibrary.getArrayType(argument), jetType)) {
if (typeChecker.equalTypes(standardLibrary.getBooleanType(), argument)) {
addName(result, "booleans", validator);
} else if (typeChecker.equalTypes(standardLibrary.getIntType(), argument)) {
}
else if (typeChecker.equalTypes(standardLibrary.getIntType(), argument)) {
addName(result, "ints", validator);
} else if (typeChecker.equalTypes(standardLibrary.getByteType(), argument)) {
}
else if (typeChecker.equalTypes(standardLibrary.getByteType(), argument)) {
addName(result, "bytes", validator);
} else if (typeChecker.equalTypes(standardLibrary.getLongType(), argument)) {
}
else if (typeChecker.equalTypes(standardLibrary.getLongType(), argument)) {
addName(result, "longs", validator);
} else if (typeChecker.equalTypes(standardLibrary.getFloatType(), argument)) {
}
else if (typeChecker.equalTypes(standardLibrary.getFloatType(), argument)) {
addName(result, "floats", validator);
} else if (typeChecker.equalTypes(standardLibrary.getDoubleType(), argument)) {
}
else if (typeChecker.equalTypes(standardLibrary.getDoubleType(), argument)) {
addName(result, "doubles", validator);
} else if (typeChecker.equalTypes(standardLibrary.getShortType(), argument)) {
}
else if (typeChecker.equalTypes(standardLibrary.getShortType(), argument)) {
addName(result, "shorts", validator);
} else if (typeChecker.equalTypes(standardLibrary.getCharType(), argument)) {
}
else if (typeChecker.equalTypes(standardLibrary.getCharType(), argument)) {
addName(result, "chars", validator);
} else if (typeChecker.equalTypes(standardLibrary.getStringType(), argument)) {
}
else if (typeChecker.equalTypes(standardLibrary.getStringType(), argument)) {
addName(result, "strings", validator);
} else {
}
else {
ClassDescriptor classDescriptor = TypeUtils.getClassDescriptor(argument);
if (classDescriptor != null) {
String className = classDescriptor.getName();
addName(result, "arrayOf" + StringUtil.capitalize(className) + "s", validator);
}
}
} else {
}
else {
addForClassType(result, jetType, validator);
}
} else {
}
else {
addForClassType(result, jetType, validator);
}
}
@@ -158,7 +178,8 @@ public class JetNameSuggester {
for (int i = 0; i < s.length(); ++i) {
if (i == 0) {
addName(result, StringUtil.decapitalize(s), validator);
} else if (s.charAt(i) >= 'A' && s.charAt(i) <= 'Z') {
}
else if (s.charAt(i) >= 'A' && s.charAt(i) <= 'Z') {
addName(result, StringUtil.decapitalize(s.substring(i)), validator);
}
}
@@ -184,16 +205,19 @@ public class JetNameSuggester {
}
}
}
} else if (expression instanceof JetSimpleNameExpression) {
}
else if (expression instanceof JetSimpleNameExpression) {
JetSimpleNameExpression reference = (JetSimpleNameExpression) expression;
String referenceName = reference.getReferencedName();
if (referenceName == null) return;
if (referenceName.equals(referenceName.toUpperCase())) {
addName(result, referenceName, validator);
} else {
}
else {
addCamelNames(result, referenceName, validator);
}
} else if (expression instanceof JetCallExpression) {
}
else if (expression instanceof JetCallExpression) {
JetCallExpression call = (JetCallExpression) expression;
addNamesForExpression(result, call.getCalleeExpression(), validator);
}
idea/src/org/jetbrains/jet/plugin/refactoring/JetNameValidatorImpl.java
+2 -1
View File
@@ -72,7 +72,8 @@ public class JetNameValidatorImpl implements JetNameValidator {
PsiElement sibling;
if (myAnchor != null) {
sibling = myAnchor;
} else {
}
else {
if (myContainer instanceof JetExpression) {
return checkElement(name, myContainer);
}
idea/src/org/jetbrains/jet/plugin/refactoring/JetRefactoringSupportProvider.java
+2 -1
View File
@@ -38,7 +38,8 @@ public class JetRefactoringSupportProvider extends RefactoringSupportProvider {
if (element instanceof JetProperty) {
JetProperty property = (JetProperty) element;
if (property.isLocal()) return true;
} else if (element instanceof JetFunction) {
}
else if (element instanceof JetFunction) {
JetFunction function = (JetFunction) element;
if (function.isLocal()) return true;
}
idea/src/org/jetbrains/jet/plugin/refactoring/JetRefactoringUtil.java
+10 -5
View File
@@ -67,7 +67,8 @@ public class JetRefactoringUtil {
while (selectionStart < selectionEnd && Character.isSpaceChar(text.charAt(selectionStart))) ++selectionStart;
while (selectionStart < selectionEnd && Character.isSpaceChar(text.charAt(selectionEnd - 1))) --selectionEnd;
callback.run(findExpression(editor, file, selectionStart, selectionEnd));
} else {
}
else {
int offset = editor.getCaretModel().getOffset();
smartSelectExpression(editor, file, offset, callback);
}
@@ -93,9 +94,11 @@ public class JetRefactoringUtil {
if (qualifiedExpression.getReceiverExpression() != element) {
addExpression = false;
}
} else if (element.getParent() instanceof JetCallElement) {
}
else if (element.getParent() instanceof JetCallElement) {
addExpression = false;
} else if (element.getParent() instanceof JetOperationExpression) {
}
else if (element.getParent() instanceof JetOperationExpression) {
JetOperationExpression operationExpression = (JetOperationExpression) element.getParent();
if (operationExpression.getOperationReference() == element) {
addExpression = false;
@@ -183,9 +186,11 @@ public class JetRefactoringUtil {
element.getTextRange().getEndOffset() != endOffset) {
//todo: if it's infix expression => add (), then commit document then return new created expression
throw new IntroduceRefactoringException(JetRefactoringBundle.message("cannot.refactor.not.expression"));
} else if (!(element instanceof JetExpression)) {
}
else if (!(element instanceof JetExpression)) {
throw new IntroduceRefactoringException(JetRefactoringBundle.message("cannot.refactor.not.expression"));
} else if (element instanceof JetBlockExpression) {
}
else if (element instanceof JetBlockExpression) {
List<JetElement> statements = ((JetBlockExpression) element).getStatements();
if (statements.size() == 1) {
JetElement elem = statements.get(0);
idea/src/org/jetbrains/jet/plugin/refactoring/copy/JetCopyClassHandler.java
+2 -1
View File
@@ -44,7 +44,8 @@ public class JetCopyClassHandler extends CopyHandlerDelegateBase {
if (element instanceof JetClassOrObject &&
JetMoveFilesOrDirectoriesHandler.isMovableClass((JetClassOrObject) element)) {
return element.getContainingFile();
} else {
}
else {
return element;
}
}
idea/src/org/jetbrains/jet/plugin/refactoring/introduceVariable/JetChangePropertyActions.java
+2 -1
View File
@@ -22,7 +22,8 @@ public class JetChangePropertyActions {
ASTNode node;
if (isVariable) {
node = JetPsiFactory.createVarNode(project);
} else {
}
else {
node = JetPsiFactory.createValNode(project);
}
property.getValOrVarNode().getPsi().replace(node.getPsi());
idea/src/org/jetbrains/jet/plugin/refactoring/introduceVariable/JetInplaceVariableIntroducer.java
+6 -3
View File
@@ -97,7 +97,8 @@ public class JetInplaceVariableIntroducer extends InplaceVariableIntroducer<JetE
PsiDocumentManager.getInstance(myProject).commitDocument(myEditor.getDocument());
if (myExprTypeCheckbox.isSelected()) {
JetChangePropertyActions.addTypeAnnotation(myProject, myProperty, myExprType);
} else {
}
else {
JetChangePropertyActions.removeTypeAnnotation(myProject, myProperty);
}
}
@@ -132,13 +133,15 @@ public class JetInplaceVariableIntroducer extends InplaceVariableIntroducer<JetE
protected void moveOffsetAfter(boolean success) {
if (!myReplaceOccurrence || myExprMarker == null) {
myEditor.getCaretModel().moveToOffset(myProperty.getTextRange().getEndOffset());
} else {
}
else {
int startOffset = myExprMarker.getStartOffset();
PsiFile file = myProperty.getContainingFile();
PsiElement elementAt = file.findElementAt(startOffset);
if (elementAt != null) {
myEditor.getCaretModel().moveToOffset(elementAt.getTextRange().getEndOffset());
} else {
}
else {
myEditor.getCaretModel().moveToOffset(myExprMarker.getEndOffset());
}
}
idea/src/org/jetbrains/jet/plugin/refactoring/move/JetMoveFilesOrDirectoriesHandler.java
+2 -1
View File
@@ -62,7 +62,8 @@ public class JetMoveFilesOrDirectoriesHandler extends MoveFilesOrDirectoriesHand
for (PsiElement element : sourceElements) {
if (element instanceof JetClassOrObject) {
result.add(element.getContainingFile());
} else {
}
else {
result.add(element);
}
}
idea/src/org/jetbrains/jet/plugin/stubindex/StubIndexServiceImpl.java
+2 -1
View File
@@ -48,7 +48,8 @@ public class StubIndexServiceImpl implements StubIndexService {
if (!stub.isExtension()) {
sink.occurrence(JetIndexKeys.TOP_LEVEL_FUNCTION_SHORT_NAME_KEY, name);
// sink.occurrence(JetIndexKeys.TOP_LEVEL_FUNCTION_FQNAME_KEY, name);
} else {
}
else {
sink.occurrence(JetIndexKeys.EXTENSION_FUNCTION_SHORT_NAME_KEY, name);
// sink.occurrence(JetIndexKeys.EXTENSION_FUNCTION_FQNAME_KEY, name);
}
idea/tests/org/jetbrains/jet/plugin/parameterInfo/JetFunctionParameterInfoTest.java
+2 -1
View File
@@ -95,7 +95,8 @@ public class JetFunctionParameterInfoTest extends LightCodeInsightFixtureTestCas
if (lastChild.getNode().getElementType().equals(JetTokens.BLOCK_COMMENT)) {
String lastChildText = lastChild.getText();
expectedResultText = lastChildText.substring(2, lastChildText.length() - 2).trim();
} else if (lastChild.getNode().getElementType().equals(JetTokens.EOL_COMMENT)) {
}
else if (lastChild.getNode().getElementType().equals(JetTokens.EOL_COMMENT)) {
expectedResultText = lastChild.getText().substring(2).trim();
}
assert expectedResultText != null;
idea/tests/org/jetbrains/jet/plugin/refactoring/introduceVariable/JetIntroduceVariableTest.java
+2 -1
View File
@@ -144,7 +144,8 @@ public class JetIntroduceVariableTest extends LightCodeInsightFixtureTestCase {
if (lastChild.getNode().getElementType().equals(JetTokens.BLOCK_COMMENT)) {
String lastChildText = lastChild.getText();
expectedResultText = lastChildText.substring(2, lastChildText.length() - 2).trim();
} else if (lastChild.getNode().getElementType().equals(JetTokens.EOL_COMMENT)) {
}
else if (lastChild.getNode().getElementType().equals(JetTokens.EOL_COMMENT)) {
expectedResultText = lastChild.getText().substring(2).trim();
}
assert expectedResultText != null;
idea/tests/org/jetbrains/jet/plugin/refactoring/nameSuggester/JetNameSuggesterTest.java
+2 -1
View File
@@ -82,7 +82,8 @@ public class JetNameSuggesterTest extends LightCodeInsightFixtureTestCase {
if (lastChild.getNode().getElementType().equals(JetTokens.BLOCK_COMMENT)) {
String lastChildText = lastChild.getText();
expectedResultText = lastChildText.substring(2, lastChildText.length() - 2).trim();
} else if (lastChild.getNode().getElementType().equals(JetTokens.EOL_COMMENT)) {
}
else if (lastChild.getNode().getElementType().equals(JetTokens.EOL_COMMENT)) {
expectedResultText = lastChild.getText().substring(2).trim();
}
assert expectedResultText != null;