Skip to content

Commit 09eae5a

Browse files
Merge branch '4.3.0-develop' of github.com:magento/magento2-phpstorm-plugin into update-4-3-0-from-4-2-3
2 parents 73665cd + 59fbacc commit 09eae5a

File tree

2 files changed

+10
-0
lines changed

2 files changed

+10
-0
lines changed

src/com/magento/idea/magento2plugin/lang/injection/UiComponentSyntaxInjector.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
import com.intellij.psi.html.HtmlTag;
1515
import com.intellij.psi.templateLanguages.OuterLanguageElement;
1616
import com.intellij.psi.xml.XmlText;
17+
import com.magento.idea.magento2plugin.project.Settings;
1718
import java.util.List;
1819
import org.jetbrains.annotations.NotNull;
1920

@@ -25,6 +26,10 @@ public void getLanguagesToInject(
2526
final @NotNull MultiHostRegistrar registrar,
2627
final @NotNull PsiElement host
2728
) {
29+
if (!Settings.isEnabled(host.getProject())) {
30+
return;
31+
}
32+
2833
if (!isUiComponentTag(host)) {
2934
return;
3035
}

src/com/magento/idea/magento2plugin/lang/psi/search/MagentoSearchScopesProvider.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
import com.intellij.openapi.util.NlsContexts;
1111
import com.intellij.psi.search.SearchScope;
1212
import com.intellij.psi.search.SearchScopeProvider;
13+
import com.magento.idea.magento2plugin.project.Settings;
1314
import java.util.Collections;
1415
import java.util.List;
1516
import org.jetbrains.annotations.NotNull;
@@ -27,6 +28,10 @@ public class MagentoSearchScopesProvider implements SearchScopeProvider {
2728
final @NotNull Project project,
2829
final @NotNull DataContext dataContext
2930
) {
31+
if (!Settings.isEnabled(project)) {
32+
return Collections.emptyList();
33+
}
34+
3035
return Collections.singletonList(AllFilesExceptTestsScope.getInstance(project));
3136
}
3237
}

0 commit comments

Comments
 (0)