adding extension methods from import.hx to completion suggestions (#1234)

Author: m0rkeulv

src/main/java/com/intellij/plugins/haxe/ide/inspections/HaxeUnusedImportInspection.java

@@ -70,6 +70,9 @@ public String getShortName() {
   @Override
   public ProblemDescriptor[] checkFile(@NotNull PsiFile file, @NotNull InspectionManager manager, boolean isOnTheFly) {
     if (!(file instanceof HaxeFile)) return null;
+    // ignoring "import.hx" as it's a special file that is used as  imports for other files
+    if (file.getVirtualFile().getName().equals("import.hx")) return null;
+
     List<HaxeImportStatement> unusedImports = HaxeImportUtil.findUnusedImports(file);
     if (unusedImports.isEmpty()) {
       return ProblemDescriptor.EMPTY_ARRAY;

src/main/java/com/intellij/plugins/haxe/lang/psi/impl/HaxeReferenceImpl.java

@@ -1430,14 +1430,26 @@ private static void addUsingVariants(Set<HaxeComponentName> variants,
                                        HaxeReferenceImpl reference) {
 
     if (ourClass == null) return;
-
-    HaxeFileModel.fromElement(reference).getUsingModels().stream()
-      .flatMap(model -> model.getExtensionMethods(ourClass, reference).stream())
-      .map(HaxeMemberModel::getNamePsi)
-      .forEach(name -> {
-        variants.add(name);
-        variantsWithExtension.add(name);
-      });
+    HaxeFileModel haxeFileModel = HaxeFileModel.fromElement(reference);
+    if(haxeFileModel != null) {
+
+      List<HaxeUsingModel> importHxUsingModels = findImportHxFileUsingModels(haxeFileModel);
+      importHxUsingModels.stream()
+              .flatMap(model -> model.getExtensionMethods(ourClass, reference).stream())
+              .map(HaxeMemberModel::getNamePsi)
+              .forEach(name -> {
+                variants.add(name);
+                variantsWithExtension.add(name);
+              });
+
+      haxeFileModel.getUsingModels().stream()
+              .flatMap(model -> model.getExtensionMethods(ourClass, reference).stream())
+              .map(HaxeMemberModel::getNamePsi)
+              .forEach(name -> {
+                variants.add(name);
+                variantsWithExtension.add(name);
+              });
+    }
 
     List<HaxeMethodModel> extensionMethodsFromMeta = ourClass.getModel().getExtensionMethodsFromMeta();
     extensionMethodsFromMeta.stream()
@@ -1450,6 +1462,15 @@ private static void addUsingVariants(Set<HaxeComponentName> variants,
 
   }
 
+  private static  @NotNull List<HaxeUsingModel> findImportHxFileUsingModels(HaxeFileModel haxeFileModel) {
+    final List<HaxeUsingModel> usingModels = new ArrayList<>();
+    HaxeResolveUtil.walkDirectoryImports(haxeFileModel, (importModel) ->{
+      usingModels.addAll(importModel.getUsingModels());
+      return true;
+    });
+    return usingModels;
+  }
+
   private static void addClassVariants(Set<HaxeComponentName> suggestedVariants, @Nullable HaxeClass haxeClass, boolean filterByAccess,
                                        @Nullable HaxeGenericResolver resolver) {
     if (haxeClass == null) {