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

Rename: Drop 'operator' keyword if new name doesn't correspond to any convention

Browse Source 
#KT-9357 Fixed
This commit is contained in:
Alexey Sedunov
2015-09-29 20:27:55 +03:00
parent 1f6f617546
commit 2f251b9216
16 changed files with 42 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/kotlin/psi/JetNamedDeclarationStub.java
+14 -4
View File
@@ -26,12 +26,13 @@ import com.intellij.util.IncorrectOperationException;
import org.jetbrains.annotations.NonNls;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.kotlin.psi.stubs.KotlinStubWithFqName;
import org.jetbrains.kotlin.lexer.JetTokens;
import org.jetbrains.kotlin.name.FqName;
import org.jetbrains.kotlin.name.Name;
import org.jetbrains.kotlin.lexer.JetTokens;
import org.jetbrains.kotlin.psi.stubs.KotlinStubWithFqName;
import org.jetbrains.kotlin.types.expressions.OperatorConventions;
import static org.jetbrains.kotlin.psi.PsiPackage.JetPsiFactory;
import static org.jetbrains.kotlin.psi.JetPsiFactoryKt.JetPsiFactory;
abstract class JetNamedDeclarationStub<T extends KotlinStubWithFqName<?>> extends JetDeclarationStub<T> implements JetNamedDeclaration {
public JetNamedDeclarationStub(@NotNull T stub, @NotNull IStubElementType nodeType) {
@@ -79,7 +80,16 @@ abstract class JetNamedDeclarationStub<T extends KotlinStubWithFqName<?>> extend
@Override
public PsiElement setName(@NonNls @NotNull String name) throws IncorrectOperationException {
PsiElement identifier = getNameIdentifier();
return identifier != null ? identifier.replace(JetPsiFactory(this).createNameIdentifier(name)) : null;
if (identifier == null) return null;
JetModifierList modifierList = getModifierList();
if (modifierList != null &&
modifierList.hasModifier(JetTokens.OPERATOR_KEYWORD) &&
!OperatorConventions.isConventionName(Name.identifierNoValidate(name))) {
removeModifier(JetTokens.OPERATOR_KEYWORD);
}
return identifier.replace(JetPsiFactory(this).createNameIdentifier(name));
}
@Override
compiler/frontend/src/org/jetbrains/kotlin/resolve/OperatorModifierChecker.kt
-9
View File
@@ -37,19 +37,10 @@ import org.jetbrains.kotlin.descriptors.FunctionDescriptor
import org.jetbrains.kotlin.diagnostics.DiagnosticSink
import org.jetbrains.kotlin.diagnostics.Errors
import org.jetbrains.kotlin.lexer.JetTokens
import org.jetbrains.kotlin.name.Name
import org.jetbrains.kotlin.psi.JetDeclaration
import org.jetbrains.kotlin.types.expressions.OperatorConventions.*
public class OperatorModifierChecker : DeclarationChecker {
private companion object {
private val GET = Name.identifier("get")
private val SET = Name.identifier("set")
private val COMPONENT_REGEX = "component\\d+".toRegex()
}
override fun check(
declaration: JetDeclaration,
descriptor: DeclarationDescriptor,
compiler/frontend/src/org/jetbrains/kotlin/types/expressions/OperatorConventions.java
+13
View File
@@ -18,6 +18,7 @@ package org.jetbrains.kotlin.types.expressions;
import com.google.common.collect.ImmutableBiMap;
import com.google.common.collect.ImmutableSet;
import kotlin.text.Regex;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.kotlin.lexer.JetSingleValueToken;
@@ -37,6 +38,7 @@ public class OperatorConventions {
public static final Name SET = Name.identifier("set");
public static final Name NEXT = Name.identifier("next");
public static final Name HAS_NEXT = Name.identifier("hasNext");
public static final Regex COMPONENT_REGEX = new Regex("component\\d+");
private OperatorConventions() {}
@@ -110,6 +112,13 @@ public class OperatorConventions {
.put(JetTokens.OROR, Name.identifier("or"))
.build();
public static final ImmutableSet<Name> CONVENTION_NAMES = ImmutableSet.<Name>builder()
.add(GET, SET, INVOKE, CONTAINS, ITERATOR, NEXT, HAS_NEXT, EQUALS, COMPARE_TO)
.addAll(UNARY_OPERATION_NAMES.values())
.addAll(BINARY_OPERATION_NAMES.values())
.addAll(ASSIGNMENT_OPERATIONS.values())
.build();
@Nullable
public static Name getNameForOperationSymbol(@NotNull JetToken token) {
Name name = UNARY_OPERATION_NAMES.get(token);
@@ -123,4 +132,8 @@ public class OperatorConventions {
if (IN_OPERATIONS.contains(token)) return CONTAINS;
return null;
}
public static boolean isConventionName(@NotNull Name name) {
return CONVENTION_NAMES.contains(name) || COMPONENT_REGEX.matches(name.asString());
}
}