MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

removed dependency on java-impl

Browse Source
This commit is contained in:
Alexey Kudravtsev
2014-04-30 15:07:20 +04:00
parent 46408bee30
commit 4fe1761413
2 changed files with 26 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/psi/impl/JavaPsiImplementationHelperImpl.java
+1 -24
View File
@@ -1,5 +1,5 @@
/*
* Copyright 2000-2013 JetBrains s.r.o.
* Copyright 2000-2014 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -235,29 +235,6 @@ public class JavaPsiImplementationHelperImpl extends JavaPsiImplementationHelper
return null;
}
// TODO remove as soon as an arrangement sub-system is provided for groovy.
public static int getMemberOrderWeight(PsiElement member, CodeStyleSettings settings) {
if (member instanceof PsiField) {
if (member instanceof PsiEnumConstant) {
return 1;
}
return ((PsiField)member).hasModifierProperty(PsiModifier.STATIC) ? settings.STATIC_FIELDS_ORDER_WEIGHT + 1
: settings.FIELDS_ORDER_WEIGHT + 1;
}
if (member instanceof PsiMethod) {
if (((PsiMethod)member).isConstructor()) {
return settings.CONSTRUCTORS_ORDER_WEIGHT + 1;
}
return ((PsiMethod)member).hasModifierProperty(PsiModifier.STATIC) ? settings.STATIC_METHODS_ORDER_WEIGHT + 1
: settings.METHODS_ORDER_WEIGHT + 1;
}
if (member instanceof PsiClass) {
return ((PsiClass)member).hasModifierProperty(PsiModifier.STATIC) ? settings.STATIC_INNER_CLASSES_ORDER_WEIGHT + 1
: settings.INNER_CLASSES_ORDER_WEIGHT + 1;
}
return -1;
}
@Override
public void setupCatchBlock(@NotNull String exceptionName, @NotNull PsiType exceptionType, PsiElement context, @NotNull PsiCatchSection catchSection) {
final FileTemplate catchBodyTemplate = FileTemplateManager.getInstance().getCodeTemplate(JavaTemplateUtil.TEMPLATE_CATCH_BODY);
plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/typedef/GrTypeDefinitionImpl.java
+25 -2
View File
@@ -764,16 +764,39 @@ public abstract class GrTypeDefinitionImpl extends GrStubElementBase<GrTypeDefin
return null;
}
// TODO remove as soon as an arrangement sub-system is provided for groovy.
public static int getMemberOrderWeight(PsiElement member, CodeStyleSettings settings) {
if (member instanceof PsiField) {
if (member instanceof PsiEnumConstant) {
return 1;
}
return ((PsiField)member).hasModifierProperty(PsiModifier.STATIC) ? settings.STATIC_FIELDS_ORDER_WEIGHT + 1
: settings.FIELDS_ORDER_WEIGHT + 1;
}
if (member instanceof PsiMethod) {
if (((PsiMethod)member).isConstructor()) {
return settings.CONSTRUCTORS_ORDER_WEIGHT + 1;
}
return ((PsiMethod)member).hasModifierProperty(PsiModifier.STATIC) ? settings.STATIC_METHODS_ORDER_WEIGHT + 1
: settings.METHODS_ORDER_WEIGHT + 1;
}
if (member instanceof PsiClass) {
return ((PsiClass)member).hasModifierProperty(PsiModifier.STATIC) ? settings.STATIC_INNER_CLASSES_ORDER_WEIGHT + 1
: settings.INNER_CLASSES_ORDER_WEIGHT + 1;
}
return -1;
}
@Nullable
private PsiElement getDefaultAnchor(GrTypeDefinitionBody body, PsiMember member) {
CodeStyleSettings settings = CodeStyleSettingsManager.getSettings(getProject());
int order = JavaPsiImplementationHelperImpl.getMemberOrderWeight(member, settings);
int order = getMemberOrderWeight(member, settings);
if (order < 0) return null;
PsiElement lastMember = null;
for (PsiElement child = body.getFirstChild(); child != null; child = child.getNextSibling()) {
int order1 = JavaPsiImplementationHelperImpl.getMemberOrderWeight(getAnyMember(child), settings);
int order1 = getMemberOrderWeight(getAnyMember(child), settings);
if (order1 < 0) continue;
if (order1 > order) {
final PsiElement lBrace = body.getLBrace();