Skip to content

Bugfix-645: Fixed failed to build require-js index #815

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 8 commits into from
Nov 30, 2021
Merged

Bugfix-645: Fixed failed to build require-js index #815

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
2cff8f0
645: Code refactoring
bohdan-harniuk Nov 30, 2021
0918b7a
645: Fixed method could be final
bohdan-harniuk Nov 30, 2021
67e9fc7
645: Fixed local variable could be final
bohdan-harniuk Nov 30, 2021
58f32f9
645: Code refactoring
bohdan-harniuk Nov 30, 2021
b206366
645: Fixed LiteralsFirstInComparisons
bohdan-harniuk Nov 30, 2021
548359f
645: Code refactoring
bohdan-harniuk Nov 30, 2021
2492c26
645: Fixed bug
bohdan-harniuk Nov 30, 2021
8374386
645: Code refactoring
bohdan-harniuk Nov 30, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
165 changes: 105 additions & 60 deletions src/com/magento/idea/magento2plugin/stubs/indexes/js/RequireJsIndex.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,114 +2,159 @@
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/

package com.magento.idea.magento2plugin.stubs.indexes.js;

import com.intellij.lang.javascript.JavaScriptFileType;
import com.intellij.lang.javascript.psi.*;
import com.intellij.lang.javascript.psi.JSExpression;
import com.intellij.lang.javascript.psi.JSFile;
import com.intellij.lang.javascript.psi.JSObjectLiteralExpression;
import com.intellij.lang.javascript.psi.JSProperty;
import com.intellij.lang.javascript.psi.JSVarStatement;
import com.intellij.lang.javascript.psi.JSVariable;
import com.intellij.psi.PsiElement;
import com.intellij.psi.util.PsiTreeUtil;
import com.intellij.util.indexing.*;
import com.intellij.util.indexing.DataIndexer;
import com.intellij.util.indexing.FileBasedIndex;
import com.intellij.util.indexing.FileBasedIndexExtension;
import com.intellij.util.indexing.FileContent;
import com.intellij.util.indexing.ID;
import com.intellij.util.io.DataExternalizer;
import com.intellij.util.io.EnumeratorStringDescriptor;
import com.intellij.util.io.KeyDescriptor;
import org.jetbrains.annotations.NotNull;
import java.util.HashMap;
import java.util.Map;
import org.jetbrains.annotations.NotNull;

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

@NotNull
public static final ID<String, String> KEY = ID.create(
"com.magento.idea.magento2plugin.stubs.indexes.require_js"
);

@Override
public ID<String, String> getName() {
public @NotNull ID<String, String> getName() {
return KEY;
}

@NotNull
@Override
public DataIndexer<String, String, FileContent> getIndexer() {
public @NotNull DataIndexer<String, String, FileContent> getIndexer() {
return inputData -> {
Map<String, String> map = new HashMap<>();
JSFile jsFile = (JSFile)inputData.getPsiFile();
final Map<String, String> map = new HashMap<>();
final JSFile jsFile = (JSFile) inputData.getPsiFile();

final JSVarStatement jsVarStatement = PsiTreeUtil.getChildOfType(
jsFile,
JSVarStatement.class
);

JSVarStatement jsVarStatement = PsiTreeUtil.getChildOfType(jsFile, JSVarStatement.class);
if (jsVarStatement == null) {
return map;
}
JSVariable[] jsVariableList = jsVarStatement.getVariables();
for (JSVariable jsVariable : jsVariableList) {
String name = jsVariable.getName();
if (name.equals("config")) {
JSObjectLiteralExpression config = PsiTreeUtil.getChildOfType(jsVariable, JSObjectLiteralExpression.class);
final JSVariable[] jsVariableList = jsVarStatement.getVariables();

for (final JSVariable jsVariable : jsVariableList) {
final String name = jsVariable.getName();

if ("config".equals(name)) {
final JSObjectLiteralExpression config = PsiTreeUtil.getChildOfType(
jsVariable,
JSObjectLiteralExpression.class
);

if (config == null) {
return map;
}
parseConfigMap(map, config);

JSProperty pathsMap = config.findProperty("paths");
if (pathsMap == null) {
return map;
}
JSObjectLiteralExpression[] pathGroupsWrappers = PsiTreeUtil.getChildrenOfType(pathsMap, JSObjectLiteralExpression.class);
for (JSObjectLiteralExpression pathGroupsWrapper : pathGroupsWrappers) {
JSProperty[] allConfigs = pathGroupsWrapper.getProperties();
for (JSProperty mapping : allConfigs) {
String nameConfig = mapping.getName();
JSExpression value = mapping.getValue();
if (value == null) {
continue;
}
String valueConfig = value.getText();
map.put(nameConfig, valueConfig);
}
}
parseConfigPaths(map, config);
}
}

return map;
};
}

private void parseConfigMap(Map<String, String> map, JSObjectLiteralExpression config) {
JSProperty configMap = config.findProperty("map");
private void parseConfigMap(
final Map<String, String> map,
final JSObjectLiteralExpression config
) {
final JSProperty configMap = config.findProperty("map");

if (configMap == null) {
return;
}
final JSObjectLiteralExpression[] configGroupsWrappers = PsiTreeUtil.getChildrenOfType(
configMap,
JSObjectLiteralExpression.class
);
if (configGroupsWrappers == null) {
return;
}

JSObjectLiteralExpression[] configGroupsWrappers = PsiTreeUtil.getChildrenOfType(configMap, JSObjectLiteralExpression.class);
for (JSObjectLiteralExpression configGroupsWrapper : configGroupsWrappers) {
PsiElement[] configGroups = configGroupsWrapper.getChildren();
for (final JSObjectLiteralExpression configGroupsWrapper : configGroupsWrappers) {
final PsiElement[] configGroups = configGroupsWrapper.getChildren();

for (PsiElement configGroup : configGroups) {
JSObjectLiteralExpression mappingWrapper = PsiTreeUtil.getChildOfType(configGroup, JSObjectLiteralExpression.class);
JSProperty[] allConfigs = mappingWrapper.getProperties();
for (final PsiElement configGroup : configGroups) {
final JSObjectLiteralExpression mappingWrapper = PsiTreeUtil.getChildOfType(
configGroup,
JSObjectLiteralExpression.class
);

for (JSProperty mapping : allConfigs) {
String nameConfig = mapping.getName();
JSExpression value = mapping.getValue();
if (value == null) {
continue;
}
String valueConfig = value.getText();
map.put(nameConfig, valueConfig);
if (mappingWrapper == null) {
continue;
}
processObjectProperties(map, mappingWrapper.getProperties());
}
}
}

@NotNull
private void parseConfigPaths(
final Map<String, String> map,
final JSObjectLiteralExpression config
) {
final JSProperty pathsMap = config.findProperty("paths");

if (pathsMap == null) {
return;
}
final JSObjectLiteralExpression[] pathGroupsWrappers = PsiTreeUtil
.getChildrenOfType(pathsMap, JSObjectLiteralExpression.class);

if (pathGroupsWrappers == null) {
return;
}

for (final JSObjectLiteralExpression pathGroupsWrapper : pathGroupsWrappers) {
processObjectProperties(map, pathGroupsWrapper.getProperties());
}
}

private void processObjectProperties(
final Map<String, String> map,
final JSProperty... allConfigs
) {
for (final JSProperty mapping : allConfigs) {
final String nameConfig = mapping.getName();
final JSExpression value = mapping.getValue();

if (value == null) {
continue;
}
final String valueConfig = value.getText();
map.put(nameConfig, valueConfig);
}
}

@Override
public KeyDescriptor<String> getKeyDescriptor() {
public @NotNull KeyDescriptor<String> getKeyDescriptor() {
return new EnumeratorStringDescriptor();
}

@NotNull
@Override
public FileBasedIndex.InputFilter getInputFilter() {
return virtualFile -> (
virtualFile.getFileType().equals(JavaScriptFileType.INSTANCE) && virtualFile.getName().equals("requirejs-config.js")
);
public @NotNull FileBasedIndex.InputFilter getInputFilter() {
return virtualFile ->
virtualFile.getFileType().equals(JavaScriptFileType.INSTANCE)
&& "requirejs-config.js".equals(virtualFile.getName());
}

@Override
Expand All @@ -122,8 +167,8 @@ public int getVersion() {
return 1;
}

@NotNull
public DataExternalizer<String> getValueExternalizer() {
@Override
public @NotNull DataExternalizer<String> getValueExternalizer() {
return EnumeratorStringDescriptor.INSTANCE;
}
}