This is an automated email from the ASF dual-hosted git repository.

joshtynjala pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/royale-compiler.git

commit 4e086a1d33915fa7ab460a2009fb01b332fa8eea
Author: Josh Tynjala <joshtynj...@apache.org>
AuthorDate: Mon Sep 26 15:31:13 2022 -0700

    formatter: skip-local-config-file
---
 .../apache/royale/formatter/config/Configuration.java    | 16 ++++++++++++++++
 .../org/apache/royale/formatter/config/Configurator.java |  3 ++-
 2 files changed, 18 insertions(+), 1 deletion(-)

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 d3ee23a3e..2e1883904 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
@@ -214,6 +214,22 @@ public class Configuration {
         this.files.addAll(args);
     }
 
+    //
+    // '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
     //
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 26ab6653b..f95f9e955 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 @@ public class Configurator implements Cloneable
             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.

Reply via email to