Merge pull request #209 from magento/forward-port-custom-file-separator

Vitaliy · web-flow · commit 2ea351e62233 · 2020-04-23T00:24:27.000-07:00
Forward port custom file separator [207]
diff --git a/src/com/magento/idea/magento2plugin/actions/generation/dialog/CreateAPluginDialog.java b/src/com/magento/idea/magento2plugin/actions/generation/dialog/CreateAPluginDialog.java
@@ -21,7 +21,7 @@
 import javax.swing.*;
 import java.awt.*;
 import java.awt.event.*;
-import java.io.File;
+import com.magento.idea.magento2plugin.magento.packages.File;
 import java.util.List;
 
 public class CreateAPluginDialog extends AbstractDialog {
diff --git a/src/com/magento/idea/magento2plugin/actions/generation/dialog/CreateAnObserverDialog.java b/src/com/magento/idea/magento2plugin/actions/generation/dialog/CreateAnObserverDialog.java
@@ -5,24 +5,20 @@
 package com.magento.idea.magento2plugin.actions.generation.dialog;
 
 import com.intellij.openapi.project.Project;
-import com.jetbrains.php.lang.psi.elements.Method;
-import com.jetbrains.php.lang.psi.elements.PhpClass;
 import com.magento.idea.magento2plugin.actions.generation.CreateAPluginAction;
 import com.magento.idea.magento2plugin.actions.generation.CreateAnObserverAction;
 import com.magento.idea.magento2plugin.actions.generation.data.ObserverEventsXmlData;
 import com.magento.idea.magento2plugin.actions.generation.data.ObserverFileData;
-import com.magento.idea.magento2plugin.actions.generation.dialog.validator.CreateAPluginDialogValidator;
 import com.magento.idea.magento2plugin.actions.generation.dialog.validator.CreateAnObserverDialogValidator;
 import com.magento.idea.magento2plugin.actions.generation.generator.ObserverClassGenerator;
 import com.magento.idea.magento2plugin.actions.generation.generator.ObserverEventsXmlGenerator;
 import com.magento.idea.magento2plugin.indexes.ModuleIndex;
 import com.magento.idea.magento2plugin.magento.packages.Package;
 import com.magento.idea.magento2plugin.ui.FilteredComboBox;
 import org.jetbrains.annotations.NotNull;
-
 import javax.swing.*;
 import java.awt.event.*;
-import java.io.File;
+import com.magento.idea.magento2plugin.magento.packages.File;
 import java.util.List;
 
 public class CreateAnObserverDialog extends AbstractDialog {
diff --git a/src/com/magento/idea/magento2plugin/actions/generation/dialog/NewBlockDialog.java b/src/com/magento/idea/magento2plugin/actions/generation/dialog/NewBlockDialog.java
@@ -16,7 +16,7 @@
 import com.magento.idea.magento2plugin.util.magento.GetModuleNameByDirectory;
 import javax.swing.*;
 import java.awt.event.*;
-import java.io.File;
+import com.magento.idea.magento2plugin.magento.packages.File;
 
 public class NewBlockDialog extends AbstractDialog {
     private final NewBlockValidator validator;
diff --git a/src/com/magento/idea/magento2plugin/actions/generation/dialog/NewGraphQlResolverDialog.java b/src/com/magento/idea/magento2plugin/actions/generation/dialog/NewGraphQlResolverDialog.java
@@ -16,7 +16,7 @@
 import com.magento.idea.magento2plugin.util.magento.GetModuleNameByDirectory;
 import javax.swing.*;
 import java.awt.event.*;
-import java.io.File;
+import com.magento.idea.magento2plugin.magento.packages.File;
 
 public class NewGraphQlResolverDialog extends AbstractDialog {
     private final NewGraphQlResolverValidator validator;
diff --git a/src/com/magento/idea/magento2plugin/actions/generation/dialog/NewViewModelDialog.java b/src/com/magento/idea/magento2plugin/actions/generation/dialog/NewViewModelDialog.java
@@ -16,7 +16,7 @@
 import com.magento.idea.magento2plugin.util.magento.GetModuleNameByDirectory;
 import javax.swing.*;
 import java.awt.event.*;
-import java.io.File;
+import com.magento.idea.magento2plugin.magento.packages.File;
 
 public class NewViewModelDialog extends AbstractDialog {
     private final NewViewModelValidator validator;
diff --git a/src/com/magento/idea/magento2plugin/actions/generation/dialog/OverrideClassByAPreferenceDialog.java b/src/com/magento/idea/magento2plugin/actions/generation/dialog/OverrideClassByAPreferenceDialog.java
@@ -21,7 +21,7 @@
 import org.jetbrains.annotations.NotNull;
 import javax.swing.*;
 import java.awt.event.*;
-import java.io.File;
+import com.magento.idea.magento2plugin.magento.packages.File;
 import java.util.List;
 
 public class OverrideClassByAPreferenceDialog extends AbstractDialog {
diff --git a/src/com/magento/idea/magento2plugin/actions/generation/generator/ModuleBlockClassGenerator.java b/src/com/magento/idea/magento2plugin/actions/generation/generator/ModuleBlockClassGenerator.java
@@ -20,6 +20,7 @@
 import com.magento.idea.magento2plugin.bundles.ValidatorBundle;
 import org.jetbrains.annotations.NotNull;
 import javax.swing.*;
+import com.magento.idea.magento2plugin.magento.packages.File;
 import java.util.Properties;
 
 public class ModuleBlockClassGenerator extends FileGenerator {
@@ -68,7 +69,7 @@ private String getBlockFqn() {
     private PhpFile createBlockClass(String actionName) {
         PsiDirectory parentDirectory = ModuleIndex.getInstance(project)
                 .getModuleDirectoryByModuleName(getBlockModule());
-        String[] blockDirectories = blockFileData.getBlockDirectory().split("/");
+        String[] blockDirectories = blockFileData.getBlockDirectory().split(File.separator);
         for (String blockDirectory: blockDirectories) {
             parentDirectory = directoryGenerator.findOrCreateSubdirectory(parentDirectory, blockDirectory);
         }
diff --git a/src/com/magento/idea/magento2plugin/actions/generation/generator/ModuleGraphQlResolverClassGenerator.java b/src/com/magento/idea/magento2plugin/actions/generation/generator/ModuleGraphQlResolverClassGenerator.java
@@ -28,6 +28,7 @@
 import com.magento.idea.magento2plugin.bundles.ValidatorBundle;
 import org.jetbrains.annotations.NotNull;
 import javax.swing.*;
+import com.magento.idea.magento2plugin.magento.packages.File;
 import java.util.Properties;
 
 public class ModuleGraphQlResolverClassGenerator extends FileGenerator {
@@ -105,7 +106,7 @@ private int getInsertPos(PhpClass graphQlResolverClass) {
     private PhpClass createGraphQlResolverClass(String actionName) {
         PsiDirectory parentDirectory = ModuleIndex.getInstance(project)
                 .getModuleDirectoryByModuleName(graphQlResolverFileData.getGraphQlResolverModule());
-        String[] graphQlResolverDirectories = graphQlResolverFileData.getGraphQlResolverDirectory().split("/");
+        String[] graphQlResolverDirectories = graphQlResolverFileData.getGraphQlResolverDirectory().split(File.separator);
         for (String graphQlResolverDirectory: graphQlResolverDirectories) {
             parentDirectory = directoryGenerator.findOrCreateSubdirectory(parentDirectory, graphQlResolverDirectory);
         }
diff --git a/src/com/magento/idea/magento2plugin/actions/generation/generator/ModuleViewModelClassGenerator.java b/src/com/magento/idea/magento2plugin/actions/generation/generator/ModuleViewModelClassGenerator.java
@@ -19,6 +19,7 @@
 import com.magento.idea.magento2plugin.bundles.ValidatorBundle;
 import org.jetbrains.annotations.NotNull;
 import javax.swing.*;
+import com.magento.idea.magento2plugin.magento.packages.File;
 import java.util.Properties;
 
 public class ModuleViewModelClassGenerator extends FileGenerator {
@@ -65,7 +66,7 @@ private String getViewModelFqn() {
     private PhpFile createViewModelClass(String actionName) {
         PsiDirectory parentDirectory = ModuleIndex.getInstance(project)
                 .getModuleDirectoryByModuleName(getViewModelModule());
-        String[] viewModelDirectories = viewModelFileData.getViewModelDirectory().split("/");
+        String[] viewModelDirectories = viewModelFileData.getViewModelDirectory().split(File.separator);
         for (String viewModelDirectory: viewModelDirectories) {
             parentDirectory = directoryGenerator.findOrCreateSubdirectory(parentDirectory, viewModelDirectory);
         }
diff --git a/src/com/magento/idea/magento2plugin/actions/generation/generator/ObserverClassGenerator.java b/src/com/magento/idea/magento2plugin/actions/generation/generator/ObserverClassGenerator.java
@@ -27,6 +27,7 @@
 import com.magento.idea.magento2plugin.util.GetPhpClassByFQN;
 import com.magento.idea.magento2plugin.bundles.ValidatorBundle;
 import javax.swing.*;
+import com.magento.idea.magento2plugin.magento.packages.File;
 import java.util.Properties;
 
 public class ObserverClassGenerator extends FileGenerator {
@@ -112,7 +113,7 @@ private int getInsertPos(PhpClass observerClass) {
     private PhpClass createObserverClass(String actionName) {
         PsiDirectory parentDirectory = ModuleIndex.getInstance(project)
                 .getModuleDirectoryByModuleName(observerFileData.getObserverModule());
-        String[] observerDirectories = observerFileData.getObserverDirectory().split("/");
+        String[] observerDirectories = observerFileData.getObserverDirectory().split(File.separator);
         for (String observerDirectory: observerDirectories) {
             parentDirectory = directoryGenerator.findOrCreateSubdirectory(parentDirectory, observerDirectory);
         }
diff --git a/src/com/magento/idea/magento2plugin/actions/generation/generator/PluginClassGenerator.java b/src/com/magento/idea/magento2plugin/actions/generation/generator/PluginClassGenerator.java
@@ -38,6 +38,7 @@
 import gnu.trove.THashSet;
 import org.jetbrains.annotations.NotNull;
 import javax.swing.*;
+import com.magento.idea.magento2plugin.magento.packages.File;
 import java.util.Collection;
 import java.util.List;
 import java.util.Properties;
@@ -141,7 +142,7 @@ private boolean checkIfMethodExist(PhpClass pluginClass, PluginMethodData[] plug
 
     private PhpClass createPluginClass(String actionName) {
         PsiDirectory parentDirectory = ModuleIndex.getInstance(project).getModuleDirectoryByModuleName(getPluginModule());
-        String[] pluginDirectories = pluginFileData.getPluginDirectory().split("/");
+        String[] pluginDirectories = pluginFileData.getPluginDirectory().split(File.separator);
         for (String pluginDirectory: pluginDirectories) {
             parentDirectory = directoryGenerator.findOrCreateSubdirectory(parentDirectory, pluginDirectory);
         }
diff --git a/src/com/magento/idea/magento2plugin/actions/generation/generator/PreferenceClassGenerator.java b/src/com/magento/idea/magento2plugin/actions/generation/generator/PreferenceClassGenerator.java
@@ -19,6 +19,7 @@
 import com.magento.idea.magento2plugin.bundles.ValidatorBundle;
 import org.jetbrains.annotations.NotNull;
 import javax.swing.*;
+import com.magento.idea.magento2plugin.magento.packages.File;
 import java.util.Properties;
 
 public class PreferenceClassGenerator extends FileGenerator {
@@ -58,7 +59,7 @@ public PsiFile generate(String actionName) {
 
     private PhpClass createPluginClass(String actionName) {
         PsiDirectory parentDirectory = ModuleIndex.getInstance(project).getModuleDirectoryByModuleName(getPreferenceModule());
-        String[] pluginDirectories = preferenceFileData.getPreferenceDirectory().split("/");
+        String[] pluginDirectories = preferenceFileData.getPreferenceDirectory().split(File.separator);
         for (String pluginDirectory: pluginDirectories) {
             parentDirectory = directoryGenerator.findOrCreateSubdirectory(parentDirectory, pluginDirectory);
         }
diff --git a/src/com/magento/idea/magento2plugin/actions/generation/generator/util/FileFromTemplateGenerator.java b/src/com/magento/idea/magento2plugin/actions/generation/generator/util/FileFromTemplateGenerator.java
@@ -23,7 +23,7 @@
 import com.magento.idea.magento2plugin.magento.files.ModuleFileInterface;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import java.io.File;
+import com.magento.idea.magento2plugin.magento.packages.File;
 import java.io.IOException;
 import java.util.Iterator;
 import java.util.List;
diff --git a/src/com/magento/idea/magento2plugin/generation/php/NewModuleForm.java b/src/com/magento/idea/magento2plugin/generation/php/NewModuleForm.java
@@ -25,7 +25,7 @@
 import javax.swing.event.DocumentEvent;
 import javax.swing.event.ListSelectionEvent;
 import javax.swing.event.ListSelectionListener;
-import java.io.File;
+import com.magento.idea.magento2plugin.magento.packages.File;
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
diff --git a/src/com/magento/idea/magento2plugin/inspections/xml/PluginDeclarationInspection.java b/src/com/magento/idea/magento2plugin/inspections/xml/PluginDeclarationInspection.java
@@ -23,7 +23,7 @@
 import com.magento.idea.magento2plugin.util.magento.GetModuleNameByDirectory;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import java.io.File;
+import com.magento.idea.magento2plugin.magento.packages.File;
 import java.util.*;
 import com.intellij.openapi.util.Pair;
 
diff --git a/src/com/magento/idea/magento2plugin/magento/packages/File.java b/src/com/magento/idea/magento2plugin/magento/packages/File.java
@@ -0,0 +1,9 @@
+/*
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+package com.magento.idea.magento2plugin.magento.packages;
+
+public class File {
+    public static String separator = "/";
+}
diff --git a/src/com/magento/idea/magento2plugin/util/magento/FileBasedIndexUtil.java b/src/com/magento/idea/magento2plugin/util/magento/FileBasedIndexUtil.java
@@ -15,7 +15,7 @@
 import com.magento.idea.magento2plugin.stubs.indexes.ModuleNameIndex;
 import com.magento.idea.magento2plugin.util.RegExUtil;
 
-import java.io.File;
+import com.magento.idea.magento2plugin.magento.packages.File;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.regex.Matcher;
diff --git a/src/com/magento/idea/magento2plugin/util/magento/MagentoVersion.java b/src/com/magento/idea/magento2plugin/util/magento/MagentoVersion.java
@@ -16,7 +16,7 @@
 import com.magento.idea.magento2plugin.magento.files.ComposerJson;
 import com.magento.idea.magento2plugin.magento.packages.ComposerPackageModel;
 import com.magento.idea.magento2plugin.magento.packages.ComposerPackageModelImpl;
-import java.io.File;
+import com.magento.idea.magento2plugin.magento.packages.File;
 
 public class MagentoVersion {
     private static MagentoVersion INSTANCE = null;
diff --git a/tests/com/magento/idea/magento2plugin/BaseProjectTestCase.java b/tests/com/magento/idea/magento2plugin/BaseProjectTestCase.java
@@ -9,7 +9,7 @@
 import com.magento.idea.magento2plugin.indexes.IndexManager;
 import com.magento.idea.magento2plugin.project.Settings;
 import com.magento.idea.magento2plugin.project.util.GetProjectBasePath;
-import java.io.File;
+import com.magento.idea.magento2plugin.magento.packages.File;
 
 /**
  * Configure test environment with Magento 2 project
diff --git a/tests/com/magento/idea/magento2plugin/completion/xml/CompletionXmlFixtureTestCase.java b/tests/com/magento/idea/magento2plugin/completion/xml/CompletionXmlFixtureTestCase.java
@@ -6,7 +6,7 @@
 
 import com.magento.idea.magento2plugin.BaseProjectTestCase;
 
-import java.io.File;
+import com.magento.idea.magento2plugin.magento.packages.File;
 import java.util.Arrays;
 import java.util.List;
 
diff --git a/tests/com/magento/idea/magento2plugin/inspections/php/InspectionPhpFixtureTestCase.java b/tests/com/magento/idea/magento2plugin/inspections/php/InspectionPhpFixtureTestCase.java
@@ -6,7 +6,7 @@
 
 import com.intellij.codeInsight.daemon.impl.HighlightInfo;
 import com.magento.idea.magento2plugin.BaseProjectTestCase;
-import java.io.File;
+import com.magento.idea.magento2plugin.magento.packages.File;
 import java.util.List;
 
 abstract public class InspectionPhpFixtureTestCase extends BaseProjectTestCase {
diff --git a/tests/com/magento/idea/magento2plugin/inspections/xml/InspectionXmlFixtureTestCase.java b/tests/com/magento/idea/magento2plugin/inspections/xml/InspectionXmlFixtureTestCase.java
@@ -2,7 +2,7 @@
 
 import com.magento.idea.magento2plugin.BaseProjectTestCase;
 
-import java.io.File;
+import com.magento.idea.magento2plugin.magento.packages.File;
 
 abstract public class InspectionXmlFixtureTestCase extends BaseProjectTestCase {
 
diff --git a/tests/com/magento/idea/magento2plugin/inspections/xml/PluginDeclarationInspectionTest.java b/tests/com/magento/idea/magento2plugin/inspections/xml/PluginDeclarationInspectionTest.java
@@ -6,7 +6,7 @@
 
 import com.magento.idea.magento2plugin.magento.files.ModuleDiXml;
 import com.magento.idea.magento2plugin.magento.packages.Package;
-import java.io.File;
+import com.magento.idea.magento2plugin.magento.packages.File;
 
 public class PluginDeclarationInspectionTest extends InspectionXmlFixtureTestCase {
 
diff --git a/tests/com/magento/idea/magento2plugin/linemarker/php/LinemarkerPhpFixtureTestCase.java b/tests/com/magento/idea/magento2plugin/linemarker/php/LinemarkerPhpFixtureTestCase.java
@@ -9,7 +9,7 @@
 import com.magento.idea.magento2plugin.BaseProjectTestCase;
 import org.jetbrains.annotations.NotNull;
 import javax.swing.*;
-import java.io.File;
+import com.magento.idea.magento2plugin.magento.packages.File;
 import java.util.List;
 
 abstract public class LinemarkerPhpFixtureTestCase extends BaseProjectTestCase {
diff --git a/tests/com/magento/idea/magento2plugin/reference/php/ReferencePhpFixtureTestCase.java b/tests/com/magento/idea/magento2plugin/reference/php/ReferencePhpFixtureTestCase.java
@@ -9,7 +9,7 @@
 import com.intellij.psi.impl.source.xml.XmlAttributeValueImpl;
 import com.magento.idea.magento2plugin.BaseProjectTestCase;
 import com.magento.idea.magento2plugin.reference.xml.PolyVariantReferenceBase;
-import java.io.File;
+import com.magento.idea.magento2plugin.magento.packages.File;
 
 abstract public class ReferencePhpFixtureTestCase extends BaseProjectTestCase {
 
diff --git a/tests/com/magento/idea/magento2plugin/reference/xml/ReferenceXmlFixtureTestCase.java b/tests/com/magento/idea/magento2plugin/reference/xml/ReferenceXmlFixtureTestCase.java
@@ -9,7 +9,7 @@
 import com.intellij.psi.xml.XmlAttributeValue;
 import com.jetbrains.php.lang.psi.elements.PhpClass;
 import com.magento.idea.magento2plugin.BaseProjectTestCase;
-import java.io.File;
+import com.magento.idea.magento2plugin.magento.packages.File;
 
 abstract public class ReferenceXmlFixtureTestCase extends BaseProjectTestCase {
 
