Skip to content

Commit 2cff8f0

Browse files
645: Code refactoring
1 parent 20d5e93 commit 2cff8f0

File tree

1 file changed

+25
-17
lines changed

1 file changed

+25
-17
lines changed

src/com/magento/idea/magento2plugin/stubs/indexes/js/RequireJsIndex.java

Lines changed: 25 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -2,36 +2,46 @@
22
* Copyright © Magento, Inc. All rights reserved.
33
* See COPYING.txt for license details.
44
*/
5+
56
package com.magento.idea.magento2plugin.stubs.indexes.js;
67

78
import com.intellij.lang.javascript.JavaScriptFileType;
8-
import com.intellij.lang.javascript.psi.*;
9+
import com.intellij.lang.javascript.psi.JSExpression;
10+
import com.intellij.lang.javascript.psi.JSFile;
11+
import com.intellij.lang.javascript.psi.JSObjectLiteralExpression;
12+
import com.intellij.lang.javascript.psi.JSProperty;
13+
import com.intellij.lang.javascript.psi.JSVarStatement;
14+
import com.intellij.lang.javascript.psi.JSVariable;
915
import com.intellij.psi.PsiElement;
1016
import com.intellij.psi.util.PsiTreeUtil;
11-
import com.intellij.util.indexing.*;
17+
import com.intellij.util.indexing.DataIndexer;
18+
import com.intellij.util.indexing.FileBasedIndex;
19+
import com.intellij.util.indexing.FileBasedIndexExtension;
20+
import com.intellij.util.indexing.FileContent;
21+
import com.intellij.util.indexing.ID;
1222
import com.intellij.util.io.DataExternalizer;
1323
import com.intellij.util.io.EnumeratorStringDescriptor;
1424
import com.intellij.util.io.KeyDescriptor;
15-
import org.jetbrains.annotations.NotNull;
1625
import java.util.HashMap;
1726
import java.util.Map;
27+
import org.jetbrains.annotations.NotNull;
1828

1929
public class RequireJsIndex extends FileBasedIndexExtension<String, String> {
20-
public static final ID<String, String> KEY =
21-
ID.create("com.magento.idea.magento2plugin.stubs.indexes.require_js");
2230

23-
@NotNull
31+
public static final ID<String, String> KEY = ID.create(
32+
"com.magento.idea.magento2plugin.stubs.indexes.require_js"
33+
);
34+
2435
@Override
25-
public ID<String, String> getName() {
36+
public @NotNull ID<String, String> getName() {
2637
return KEY;
2738
}
2839

29-
@NotNull
3040
@Override
31-
public DataIndexer<String, String, FileContent> getIndexer() {
41+
public @NotNull DataIndexer<String, String, FileContent> getIndexer() {
3242
return inputData -> {
3343
Map<String, String> map = new HashMap<>();
34-
JSFile jsFile = (JSFile)inputData.getPsiFile();
44+
JSFile jsFile = (JSFile) inputData.getPsiFile();
3545

3646
JSVarStatement jsVarStatement = PsiTreeUtil.getChildOfType(jsFile, JSVarStatement.class);
3747
if (jsVarStatement == null) {
@@ -98,17 +108,16 @@ private void parseConfigMap(Map<String, String> map, JSObjectLiteralExpression c
98108
}
99109
}
100110

101-
@NotNull
102111
@Override
103-
public KeyDescriptor<String> getKeyDescriptor() {
112+
public @NotNull KeyDescriptor<String> getKeyDescriptor() {
104113
return new EnumeratorStringDescriptor();
105114
}
106115

107-
@NotNull
108116
@Override
109-
public FileBasedIndex.InputFilter getInputFilter() {
117+
public @NotNull FileBasedIndex.InputFilter getInputFilter() {
110118
return virtualFile -> (
111-
virtualFile.getFileType().equals(JavaScriptFileType.INSTANCE) && virtualFile.getName().equals("requirejs-config.js")
119+
virtualFile.getFileType().equals(JavaScriptFileType.INSTANCE)
120+
&& virtualFile.getName().equals("requirejs-config.js")
112121
);
113122
}
114123

@@ -122,8 +131,7 @@ public int getVersion() {
122131
return 1;
123132
}
124133

125-
@NotNull
126-
public DataExternalizer<String> getValueExternalizer() {
134+
public @NotNull DataExternalizer<String> getValueExternalizer() {
127135
return EnumeratorStringDescriptor.INSTANCE;
128136
}
129137
}

0 commit comments

Comments
 (0)