Load .env variable from different types of .env file names (#446)

* Load .env variable from different types of .env file names

* Update GraphQLConfigVariableAwareEndpoint.java

Moved dotenv builder inside conditional

* Requested change

Author: mellson

README.md

@@ -15,7 +15,7 @@ GraphQL language support for WebStorm, IntelliJ IDEA and other IDEs based on the
 - Syntax highlighting, code-formatting, folding, commenter, and brace-matching
 - 'Find Usages' and 'Go to Declaration' for schema types, fields, and fragments
 - 'Structure view' to navigate GraphQL files
-- Load variables from .env files
+- Load variables from .env files. Supported file names: `.env.local`,`.env.development.local`,`.env.development`,`.env`
 
 ## Documentation
 

src/main/com/intellij/lang/jsgraphql/ide/project/graphqlconfig/model/GraphQLConfigVariableAwareEndpoint.java

@@ -14,16 +14,20 @@
 import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.fileEditor.FileDocumentManager;
 import com.intellij.openapi.project.Project;
+import com.intellij.openapi.project.ProjectUtil;
 import com.intellij.openapi.ui.DialogWrapper;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.ui.components.JBLabel;
 import com.intellij.ui.components.JBTextField;
 import com.intellij.util.ui.FormBuilder;
 import io.github.cdimascio.dotenv.Dotenv;
+import io.github.cdimascio.dotenv.DotenvBuilder;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 import javax.swing.*;
+import java.util.Arrays;
+import java.util.List;
 import java.util.Map;
 import java.util.function.Function;
 import java.util.regex.Matcher;
@@ -141,32 +145,59 @@ private String tryToGetVariableFromDotEnvFile(String varName) {
         if (configFile != null) {
             VirtualFile parentDir = configFile.getParent();
             if (parentDir != null) {
-                dotenv = Dotenv
-                    .configure()
-                    .directory(parentDir.getPath())
-                    .ignoreIfMalformed()
-                    .ignoreIfMissing()
-                    .load();
-
-                varValue = dotenv.get(varName);
+                String filename = getFileName(parentDir);
+                if (filename != null) {
+                    dotenv = getDotenvBuilder(parentDir.getPath()).filename(filename).load();
+                    varValue = dotenv.get(varName);
+                }
             }
         }
 
         // If that didn't resolve try to load the env file from the root of the project
         String projectBasePath = project.getBasePath();
         if (varValue == null && projectBasePath != null) {
-            dotenv = Dotenv
-                .configure()
-                .directory(projectBasePath)
-                .ignoreIfMalformed()
-                .ignoreIfMissing()
-                .load();
-
-            varValue = dotenv.get(varName);
+            VirtualFile projectDir = ProjectUtil.guessProjectDir(project);
+            if (projectDir != null) {
+                String filename = getFileName(projectDir);
+                if (filename != null) {
+                    dotenv = getDotenvBuilder(projectDir.getPath()).filename(filename).load();
+                    varValue = dotenv.get(varName);
+                }
+            }
         }
         return varValue;
     }
 
+    private DotenvBuilder getDotenvBuilder(String path) {
+        return Dotenv
+            .configure()
+            .directory(path)
+            .ignoreIfMalformed()
+            .ignoreIfMissing();
+    }
+
+    private String getFileName(VirtualFile dirMaybeContainingEnvFile) {
+        if (!dirMaybeContainingEnvFile.isDirectory())
+            return null;
+
+        // List of supported names for .env files in prioritized order
+        List<String> supportedEnvFiles = Arrays.asList(
+            ".env.local",
+            ".env.development.local",
+            ".env.development",
+            ".env");
+
+        // Look through the supported names and return the first we find
+        for (String envFileName : supportedEnvFiles) {
+            VirtualFile maybeEnvFile = dirMaybeContainingEnvFile.findChild(envFileName);
+            if (maybeEnvFile != null && maybeEnvFile.exists()) {
+                return envFileName;
+            }
+        }
+
+        return null;
+    }
+
     static class VariableDialog extends DialogWrapper {
 
         private static Map<String, String> previousVariables = Maps.newHashMap();