Merge pull request #285 from magento/fixed-usage-of-JavaScriptFileType

Removed usage of the JavaScriptFileType constructor

Author: Vitaliy

src/com/magento/idea/magento2plugin/completion/provider/RequireJsMappingCompletionProvider.java

@@ -2,6 +2,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 package com.magento.idea.magento2plugin.completion.provider;
 
 import com.intellij.codeInsight.completion.CompletionParameters;
@@ -13,27 +14,31 @@
 import com.intellij.util.ProcessingContext;
 import com.intellij.util.indexing.FileBasedIndex;
 import com.magento.idea.magento2plugin.stubs.indexes.js.RequireJsIndex;
-import org.jetbrains.annotations.NotNull;
 import java.util.Collection;
+import org.jetbrains.annotations.NotNull;
 
 public class RequireJsMappingCompletionProvider extends CompletionProvider<CompletionParameters> {
 
     @Override
-    protected void addCompletions(@NotNull CompletionParameters parameters,
-                                  ProcessingContext context,
-                                  @NotNull CompletionResultSet result) {
-        PsiElement position = parameters.getPosition().getOriginalElement();
+    protected void addCompletions(
+            final @NotNull CompletionParameters parameters,
+            final ProcessingContext context,
+            final @NotNull CompletionResultSet result
+    ) {
+        final PsiElement position = parameters.getPosition().getOriginalElement();
         if (position == null) {
             return;
         }
-        String prefix = result.getPrefixMatcher().getPrefix();
+        final String prefix = result.getPrefixMatcher().getPrefix();
 
-        Collection<String> requireJsKeys
-                = FileBasedIndex.getInstance().getAllKeys(RequireJsIndex.KEY, position.getProject());
+        final Collection<String> requireJsKeys
+                = FileBasedIndex.getInstance().getAllKeys(
+                        RequireJsIndex.KEY, position.getProject()
+        );
 
         requireJsKeys.removeIf(m -> !m.startsWith(prefix));
-        JavaScriptFileType jsFileType = new JavaScriptFileType();
-        for (String requireJsKey : requireJsKeys) {
+        final JavaScriptFileType jsFileType = JavaScriptFileType.INSTANCE;
+        for (final String requireJsKey : requireJsKeys) {
             result.addElement(
                     LookupElementBuilder
                             .create(requireJsKey)