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

Remove duplicating method

Browse Source
This commit is contained in:
Andrey Breslav
2012-11-23 19:03:07 +04:00
parent 5ac10ee8e5
commit 1f2e3d09af
2 changed files with 6 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/Errors.java
+4 -4
View File
@@ -149,7 +149,7 @@ public interface Errors {
SimpleDiagnosticFactory<JetModifierListOwner> ABSTRACT_MODIFIER_IN_TRAIT = SimpleDiagnosticFactory
.create(WARNING, ABSTRACT_MODIFIER);
SimpleDiagnosticFactory<JetModifierListOwner> OPEN_MODIFIER_IN_TRAIT = SimpleDiagnosticFactory
.create(WARNING, modifierPosition(JetTokens.OPEN_KEYWORD));
.create(WARNING, modifierSetPosition(JetTokens.OPEN_KEYWORD));
SimpleDiagnosticFactory<PsiElement> TRAIT_CAN_NOT_BE_FINAL = SimpleDiagnosticFactory.create(ERROR);
SimpleDiagnosticFactory<PsiElement> CONSTRUCTOR_IN_TRAIT = SimpleDiagnosticFactory.create(ERROR);
@@ -163,10 +163,10 @@ public interface Errors {
SimpleDiagnosticFactory<PsiElement> ENUM_NOT_ALLOWED = SimpleDiagnosticFactory.create(ERROR);
SimpleDiagnosticFactory<JetModifierListOwner> ILLEGAL_ENUM_ANNOTATION = SimpleDiagnosticFactory
.create(ERROR, modifierPosition(JetTokens.ENUM_KEYWORD));
.create(ERROR, modifierSetPosition(JetTokens.ENUM_KEYWORD));
SimpleDiagnosticFactory<JetModifierListOwner> OPEN_MODIFIER_IN_ENUM = SimpleDiagnosticFactory
.create(ERROR, modifierPosition(JetTokens.OPEN_KEYWORD));
.create(ERROR, modifierSetPosition(JetTokens.OPEN_KEYWORD));
SimpleDiagnosticFactory<PsiElement> CLASS_IN_SUPERTYPE_FOR_ENUM = SimpleDiagnosticFactory.create(ERROR);
@@ -199,7 +199,7 @@ public interface Errors {
DiagnosticFactory2<JetDeclaration, CallableMemberDescriptor, String> CONFLICTING_OVERLOADS = DiagnosticFactory2.create(ERROR, DECLARATION);
SimpleDiagnosticFactory<JetNamedDeclaration> NON_FINAL_MEMBER_IN_FINAL_CLASS = SimpleDiagnosticFactory.create(WARNING, modifierPosition(
SimpleDiagnosticFactory<JetNamedDeclaration> NON_FINAL_MEMBER_IN_FINAL_CLASS = SimpleDiagnosticFactory.create(WARNING, modifierSetPosition(
JetTokens.OPEN_KEYWORD));
DiagnosticFactory1<JetModifierListOwner, CallableMemberDescriptor> NOTHING_TO_OVERRIDE = DiagnosticFactory1.create(ERROR, OVERRIDE_MODIFIER);
compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/PositioningStrategies.java
+2 -17
View File
@@ -164,24 +164,9 @@ public class PositioningStrategies {
}
};
public static final PositioningStrategy<JetModifierListOwner> ABSTRACT_MODIFIER = modifierPosition(JetTokens.ABSTRACT_KEYWORD);
public static final PositioningStrategy<JetModifierListOwner> ABSTRACT_MODIFIER = modifierSetPosition(JetTokens.ABSTRACT_KEYWORD);
public static final PositioningStrategy<JetModifierListOwner> OVERRIDE_MODIFIER = modifierPosition(JetTokens.OVERRIDE_KEYWORD);
public static PositioningStrategy<JetModifierListOwner> modifierPosition(final JetKeywordToken token) {
return new PositioningStrategy<JetModifierListOwner>() {
@NotNull
@Override
public List<TextRange> mark(@NotNull JetModifierListOwner modifierListOwner) {
assert modifierListOwner.hasModifier(token);
JetModifierList modifierList = modifierListOwner.getModifierList();
assert modifierList != null;
ASTNode node = modifierList.getModifierNode(token);
assert node != null;
return markNode(node);
}
};
}
public static final PositioningStrategy<JetModifierListOwner> OVERRIDE_MODIFIER = modifierSetPosition(JetTokens.OVERRIDE_KEYWORD);
public static final PositioningStrategy<JetModifierListOwner> VARIANCE_MODIFIER = modifierSetPosition(JetTokens.IN_KEYWORD,
JetTokens.OUT_KEYWORD);