commit 4e086a1d33915fa7ab460a2009fb01b332fa8eea
author Josh Tynjala <joshtynjala@apache.org> Mon Sep 26 15:31:13 2022 -0700
committer Josh Tynjala <joshtynjala@apache.org> Mon Sep 26 15:31:13 2022 -0700
tree 14680287c468c21bd6ac207a520a1324c9614160
parent e89ab9890fa372ffd2357acf38d9a23792105a33

formatter: skip-local-config-file

formatter/src/main/java/org/apache/royale/formatter/config/Configuration.java

diff --git a/formatter/src/main/java/org/apache/royale/formatter/config/Configuration.java b/formatter/src/main/java/org/apache/royale/formatter/config/Configuration.java
index d3ee23a..2e18839 100644
--- a/formatter/src/main/java/org/apache/royale/formatter/config/Configuration.java
+++ b/formatter/src/main/java/org/apache/royale/formatter/config/Configuration.java
@@ -215,6 +215,22 @@
     }
 
     //
+    // 'skip-local-config-file' option
+    //
+
+    private boolean skipLocalConfigFile = false;
+
+    public boolean getSkipLocalConfigFile() {
+        return skipLocalConfigFile;
+    }
+
+    @Config
+    @Mapping("skip-local-config-file")
+    public void setSkipLocalConfigFile(ConfigurationValue cv, boolean b) {
+        this.skipLocalConfigFile = b;
+    }
+
+    //
     // 'write-files' option
     //
 

formatter/src/main/java/org/apache/royale/formatter/config/Configurator.java

diff --git a/formatter/src/main/java/org/apache/royale/formatter/config/Configurator.java b/formatter/src/main/java/org/apache/royale/formatter/config/Configurator.java
index 26ab665..f95f9e9 100644
--- a/formatter/src/main/java/org/apache/royale/formatter/config/Configurator.java
+++ b/formatter/src/main/java/org/apache/royale/formatter/config/Configurator.java
@@ -359,7 +359,8 @@
             if (!loadConfig())
                 success = false;
 
-            if (!loadLocalConfig())
+            String skipLocal = cfgbuf.peekSimpleConfigurationVar("skip-local-config-file");
+            if (!"true".equals(skipLocal) && !loadLocalConfig())
                 success = false;
             
             // The command line needs to take precedence over all defaults and config files.