|
4 | 4 |
|
5 | 5 | package com.wuhao.code.check.style.arrangement |
6 | 6 |
|
7 | | -import com.intellij.psi.codeStyle.arrangement.std.StdArrangementTokens |
8 | | -import com.wuhao.code.check.PostStart |
| 7 | +import com.intellij.psi.codeStyle.arrangement.std.StdArrangementTokens.EntryType.* |
| 8 | +import com.intellij.psi.codeStyle.arrangement.std.StdArrangementTokens.Modifier.* |
| 9 | +import com.intellij.psi.codeStyle.arrangement.std.StdArrangementTokens.Order.BY_NAME |
9 | 10 |
|
10 | 11 | /** |
11 | 12 | * |
12 | 13 | * @author 吴昊 |
13 | 14 | * @since 1.3.1 |
14 | 15 | */ |
15 | | -object JavaRearrangeRules: Rules() { |
| 16 | +object JavaRearrangeRules: BaseRules() { |
16 | 17 |
|
17 | | - override fun get(): List<PostStart.RuleDescription> { |
| 18 | + override fun get(): List<RuleDescription> { |
18 | 19 | return listOf( |
19 | | - PostStart.RuleDescription(listOf(StdArrangementTokens.EntryType.FIELD, StdArrangementTokens.Modifier.PUBLIC, StdArrangementTokens.Modifier.STATIC, StdArrangementTokens.Modifier.FINAL), StdArrangementTokens.Order.BY_NAME), |
20 | | - PostStart.RuleDescription(listOf(StdArrangementTokens.EntryType.FIELD, StdArrangementTokens.Modifier.PROTECTED, StdArrangementTokens.Modifier.STATIC, StdArrangementTokens.Modifier.FINAL), StdArrangementTokens.Order.BY_NAME), |
21 | | - PostStart.RuleDescription(listOf(StdArrangementTokens.EntryType.FIELD, StdArrangementTokens.Modifier.PACKAGE_PRIVATE, StdArrangementTokens.Modifier.STATIC, StdArrangementTokens.Modifier.FINAL), StdArrangementTokens.Order.BY_NAME), |
22 | | - PostStart.RuleDescription(listOf(StdArrangementTokens.EntryType.FIELD, StdArrangementTokens.Modifier.PRIVATE, StdArrangementTokens.Modifier.STATIC, StdArrangementTokens.Modifier.FINAL), StdArrangementTokens.Order.BY_NAME), |
23 | | - PostStart.RuleDescription(listOf(StdArrangementTokens.EntryType.FIELD, StdArrangementTokens.Modifier.PUBLIC, StdArrangementTokens.Modifier.STATIC), StdArrangementTokens.Order.BY_NAME), |
24 | | - PostStart.RuleDescription(listOf(StdArrangementTokens.EntryType.FIELD, StdArrangementTokens.Modifier.PROTECTED, StdArrangementTokens.Modifier.STATIC), StdArrangementTokens.Order.BY_NAME), |
25 | | - PostStart.RuleDescription(listOf(StdArrangementTokens.EntryType.FIELD, StdArrangementTokens.Modifier.PACKAGE_PRIVATE, StdArrangementTokens.Modifier.STATIC), StdArrangementTokens.Order.BY_NAME), |
26 | | - PostStart.RuleDescription(listOf(StdArrangementTokens.EntryType.FIELD, StdArrangementTokens.Modifier.PRIVATE, StdArrangementTokens.Modifier.STATIC), StdArrangementTokens.Order.BY_NAME), |
27 | | - PostStart.RuleDescription(listOf(StdArrangementTokens.EntryType.INIT_BLOCK, StdArrangementTokens.Modifier.STATIC)), |
28 | | - PostStart.RuleDescription(listOf(StdArrangementTokens.EntryType.FIELD, StdArrangementTokens.Modifier.PUBLIC, StdArrangementTokens.Modifier.FINAL), StdArrangementTokens.Order.BY_NAME), |
29 | | - PostStart.RuleDescription(listOf(StdArrangementTokens.EntryType.FIELD, StdArrangementTokens.Modifier.PROTECTED, StdArrangementTokens.Modifier.FINAL), StdArrangementTokens.Order.BY_NAME), |
30 | | - PostStart.RuleDescription(listOf(StdArrangementTokens.EntryType.FIELD, StdArrangementTokens.Modifier.PACKAGE_PRIVATE, StdArrangementTokens.Modifier.FINAL), StdArrangementTokens.Order.BY_NAME), |
31 | | - PostStart.RuleDescription(listOf(StdArrangementTokens.EntryType.FIELD, StdArrangementTokens.Modifier.PRIVATE, StdArrangementTokens.Modifier.FINAL), StdArrangementTokens.Order.BY_NAME), |
| 20 | + RuleDescription(listOf(FIELD, PUBLIC, STATIC, FINAL), BY_NAME), |
| 21 | + RuleDescription(listOf(FIELD, PROTECTED, STATIC, FINAL), BY_NAME), |
| 22 | + RuleDescription(listOf(FIELD, PACKAGE_PRIVATE, STATIC, FINAL), BY_NAME), |
| 23 | + RuleDescription(listOf(FIELD, PRIVATE, STATIC, FINAL), BY_NAME), |
| 24 | + RuleDescription(listOf(FIELD, PUBLIC, STATIC), BY_NAME), |
| 25 | + RuleDescription(listOf(FIELD, PROTECTED, STATIC), BY_NAME), |
| 26 | + RuleDescription(listOf(FIELD, PACKAGE_PRIVATE, STATIC), BY_NAME), |
| 27 | + RuleDescription(listOf(FIELD, PRIVATE, STATIC), BY_NAME), |
| 28 | + RuleDescription(listOf(INIT_BLOCK, STATIC)), |
| 29 | + RuleDescription(listOf(FIELD, PUBLIC, FINAL), BY_NAME), |
| 30 | + RuleDescription(listOf(FIELD, PROTECTED, FINAL), BY_NAME), |
| 31 | + RuleDescription(listOf(FIELD, PACKAGE_PRIVATE, FINAL), BY_NAME), |
| 32 | + RuleDescription(listOf(FIELD, PRIVATE, FINAL), BY_NAME), |
32 | 33 |
|
33 | | - PostStart.RuleDescription(listOf(StdArrangementTokens.EntryType.FIELD, StdArrangementTokens.Modifier.PUBLIC), StdArrangementTokens.Order.BY_NAME), |
34 | | - PostStart.RuleDescription(listOf(StdArrangementTokens.EntryType.FIELD, StdArrangementTokens.Modifier.PROTECTED), StdArrangementTokens.Order.BY_NAME), |
35 | | - PostStart.RuleDescription(listOf(StdArrangementTokens.EntryType.FIELD, StdArrangementTokens.Modifier.PACKAGE_PRIVATE), StdArrangementTokens.Order.BY_NAME), |
36 | | - PostStart.RuleDescription(listOf(StdArrangementTokens.EntryType.FIELD, StdArrangementTokens.Modifier.PRIVATE), StdArrangementTokens.Order.BY_NAME), |
37 | | - PostStart.RuleDescription(listOf(StdArrangementTokens.EntryType.FIELD), StdArrangementTokens.Order.BY_NAME), |
38 | | - PostStart.RuleDescription(listOf(StdArrangementTokens.EntryType.INIT_BLOCK)), |
39 | | - PostStart.RuleDescription(listOf(StdArrangementTokens.EntryType.CONSTRUCTOR)), |
| 34 | + RuleDescription(listOf(FIELD, PUBLIC), BY_NAME), |
| 35 | + RuleDescription(listOf(FIELD, PROTECTED), BY_NAME), |
| 36 | + RuleDescription(listOf(FIELD, PACKAGE_PRIVATE), BY_NAME), |
| 37 | + RuleDescription(listOf(FIELD, PRIVATE), BY_NAME), |
| 38 | + RuleDescription(FIELD, BY_NAME), |
| 39 | + RuleDescription(INIT_BLOCK), |
| 40 | + RuleDescription(CONSTRUCTOR), |
40 | 41 |
|
41 | | - PostStart.RuleDescription(listOf(StdArrangementTokens.EntryType.METHOD, StdArrangementTokens.Modifier.PUBLIC, StdArrangementTokens.Modifier.STATIC, StdArrangementTokens.Modifier.FINAL), StdArrangementTokens.Order.BY_NAME), |
42 | | - PostStart.RuleDescription(listOf(StdArrangementTokens.EntryType.METHOD, StdArrangementTokens.Modifier.PACKAGE_PRIVATE, StdArrangementTokens.Modifier.STATIC, StdArrangementTokens.Modifier.FINAL), StdArrangementTokens.Order.BY_NAME), |
43 | | - PostStart.RuleDescription(listOf(StdArrangementTokens.EntryType.METHOD, StdArrangementTokens.Modifier.PROTECTED, StdArrangementTokens.Modifier.STATIC, StdArrangementTokens.Modifier.FINAL), StdArrangementTokens.Order.BY_NAME), |
44 | | - PostStart.RuleDescription(listOf(StdArrangementTokens.EntryType.METHOD, StdArrangementTokens.Modifier.PRIVATE, StdArrangementTokens.Modifier.STATIC, StdArrangementTokens.Modifier.FINAL), StdArrangementTokens.Order.BY_NAME), |
| 42 | + RuleDescription(listOf(METHOD, PUBLIC, STATIC, FINAL), BY_NAME), |
| 43 | + RuleDescription(listOf(METHOD, PACKAGE_PRIVATE, STATIC, FINAL), BY_NAME), |
| 44 | + RuleDescription(listOf(METHOD, PROTECTED, STATIC, FINAL), BY_NAME), |
| 45 | + RuleDescription(listOf(METHOD, PRIVATE, STATIC, FINAL), BY_NAME), |
45 | 46 |
|
46 | | - PostStart.RuleDescription(listOf(StdArrangementTokens.EntryType.METHOD, StdArrangementTokens.Modifier.PUBLIC, StdArrangementTokens.Modifier.STATIC), StdArrangementTokens.Order.BY_NAME), |
47 | | - PostStart.RuleDescription(listOf(StdArrangementTokens.EntryType.METHOD, StdArrangementTokens.Modifier.PACKAGE_PRIVATE, StdArrangementTokens.Modifier.STATIC), StdArrangementTokens.Order.BY_NAME), |
48 | | - PostStart.RuleDescription(listOf(StdArrangementTokens.EntryType.METHOD, StdArrangementTokens.Modifier.PROTECTED, StdArrangementTokens.Modifier.STATIC), StdArrangementTokens.Order.BY_NAME), |
49 | | - PostStart.RuleDescription(listOf(StdArrangementTokens.EntryType.METHOD, StdArrangementTokens.Modifier.PRIVATE, StdArrangementTokens.Modifier.STATIC), StdArrangementTokens.Order.BY_NAME), |
50 | | - PostStart.RuleDescription(listOf(StdArrangementTokens.EntryType.METHOD, StdArrangementTokens.Modifier.PUBLIC, StdArrangementTokens.Modifier.FINAL), StdArrangementTokens.Order.BY_NAME), |
51 | | - PostStart.RuleDescription(listOf(StdArrangementTokens.EntryType.METHOD, StdArrangementTokens.Modifier.PACKAGE_PRIVATE, StdArrangementTokens.Modifier.FINAL), StdArrangementTokens.Order.BY_NAME), |
52 | | - PostStart.RuleDescription(listOf(StdArrangementTokens.EntryType.METHOD, StdArrangementTokens.Modifier.PROTECTED, StdArrangementTokens.Modifier.FINAL), StdArrangementTokens.Order.BY_NAME), |
53 | | - PostStart.RuleDescription(listOf(StdArrangementTokens.EntryType.METHOD, StdArrangementTokens.Modifier.PRIVATE, StdArrangementTokens.Modifier.FINAL), StdArrangementTokens.Order.BY_NAME), |
54 | | - PostStart.RuleDescription(listOf(StdArrangementTokens.EntryType.METHOD, StdArrangementTokens.Modifier.PUBLIC), StdArrangementTokens.Order.BY_NAME), |
55 | | - PostStart.RuleDescription(listOf(StdArrangementTokens.EntryType.METHOD, StdArrangementTokens.Modifier.PACKAGE_PRIVATE), StdArrangementTokens.Order.BY_NAME), |
56 | | - PostStart.RuleDescription(listOf(StdArrangementTokens.EntryType.METHOD, StdArrangementTokens.Modifier.PROTECTED), StdArrangementTokens.Order.BY_NAME), |
57 | | - PostStart.RuleDescription(listOf(StdArrangementTokens.EntryType.METHOD, StdArrangementTokens.Modifier.PRIVATE), StdArrangementTokens.Order.BY_NAME), |
58 | | - PostStart.RuleDescription(listOf(StdArrangementTokens.EntryType.METHOD), StdArrangementTokens.Order.BY_NAME), |
59 | | - PostStart.RuleDescription(listOf(StdArrangementTokens.EntryType.ENUM), StdArrangementTokens.Order.BY_NAME), |
60 | | - PostStart.RuleDescription(listOf(StdArrangementTokens.EntryType.INTERFACE), StdArrangementTokens.Order.BY_NAME), |
61 | | - PostStart.RuleDescription(listOf(StdArrangementTokens.EntryType.CLASS, StdArrangementTokens.Modifier.STATIC), StdArrangementTokens.Order.BY_NAME), |
62 | | - PostStart.RuleDescription(listOf(StdArrangementTokens.EntryType.CLASS, StdArrangementTokens.EntryType.CLASS), StdArrangementTokens.Order.BY_NAME)) |
| 47 | + RuleDescription(listOf(METHOD, PUBLIC, STATIC), BY_NAME), |
| 48 | + RuleDescription(listOf(METHOD, PACKAGE_PRIVATE, STATIC), BY_NAME), |
| 49 | + RuleDescription(listOf(METHOD, PROTECTED, STATIC), BY_NAME), |
| 50 | + RuleDescription(listOf(METHOD, PRIVATE, STATIC), BY_NAME), |
| 51 | + RuleDescription(listOf(METHOD, PUBLIC, FINAL), BY_NAME), |
| 52 | + RuleDescription(listOf(METHOD, PACKAGE_PRIVATE, FINAL), BY_NAME), |
| 53 | + RuleDescription(listOf(METHOD, PROTECTED, FINAL), BY_NAME), |
| 54 | + RuleDescription(listOf(METHOD, PRIVATE, FINAL), BY_NAME), |
| 55 | + RuleDescription(listOf(METHOD, PUBLIC), BY_NAME), |
| 56 | + RuleDescription(listOf(METHOD, PACKAGE_PRIVATE), BY_NAME), |
| 57 | + RuleDescription(listOf(METHOD, PROTECTED), BY_NAME), |
| 58 | + RuleDescription(listOf(METHOD, PRIVATE), BY_NAME), |
| 59 | + RuleDescription(METHOD, BY_NAME), |
| 60 | + RuleDescription(ENUM, BY_NAME), |
| 61 | + RuleDescription(INTERFACE, BY_NAME), |
| 62 | + RuleDescription(listOf(CLASS, STATIC), BY_NAME), |
| 63 | + RuleDescription(listOf(CLASS, CLASS), BY_NAME)) |
63 | 64 | } |
64 | 65 | } |
65 | 66 |
|
|
0 commit comments