Use the appName from the LineReader, #230

jline · Apr 5, 2018 · df01bed · df01bed
1 parent 9ccfe0b
commit df01bed
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 11 deletions.
diff --git a/builtins/src/main/java/org/jline/builtins/InputRC.java b/builtins/src/main/java/org/jline/builtins/InputRC.java
@@ -22,19 +22,19 @@
 
 public final class InputRC {
 
-    public static void configure(LineReader reader, String appName, URL url) throws IOException {
+    public static void configure(LineReader reader, URL url) throws IOException {
         try (InputStream is = url.openStream()) {
-            configure(reader, appName, is);
+            configure(reader, is);
         }
     }
 
-    public static void configure(LineReader reader, String appName, InputStream is) throws IOException {
+    public static void configure(LineReader reader, InputStream is) throws IOException {
         try (InputStreamReader r = new InputStreamReader(is)) {
-            configure(reader, appName, r);
+            configure(reader, r);
         }
     }
 
-    public static void configure(LineReader reader, String appName, Reader r) throws IOException {
+    public static void configure(LineReader reader, Reader r) throws IOException {
         BufferedReader br;
         if (r instanceof BufferedReader) {
             br = (BufferedReader) r;
@@ -48,7 +48,7 @@ public static void configure(LineReader reader, String appName, Reader r) throws
         } else if ("emacs".equals(reader.getVariable(LineReader.EDITING_MODE))) {
             reader.getKeyMaps().put(LineReader.MAIN, reader.getKeyMaps().get(LineReader.EMACS));
         }
-        new InputRC(reader, appName).parse(br);
+        new InputRC(reader).parse(br);
         if ("vi".equals(reader.getVariable(LineReader.EDITING_MODE))) {
             reader.getKeyMaps().put(LineReader.MAIN, reader.getKeyMaps().get(LineReader.VIINS));
         } else if ("emacs".equals(reader.getVariable(LineReader.EDITING_MODE))) {
@@ -57,11 +57,9 @@ public static void configure(LineReader reader, String appName, Reader r) throws
     }
 
     private final LineReader reader;
-    private final String appName;
 
-    private InputRC(LineReader reader, String appName) {
+    private InputRC(LineReader reader) {
         this.reader = reader;
-        this.appName = appName;
     }
 
     private void parse(BufferedReader br) throws IOException, IllegalArgumentException {
@@ -109,7 +107,7 @@ private void parse(BufferedReader br) throws IOException, IllegalArgumentExcepti
                             String mode = (String) reader.getVariable(LineReader.EDITING_MODE);
                             parsing = args.substring("mode=".length()).equalsIgnoreCase(mode);
                         } else {
-                            parsing = args.equalsIgnoreCase(appName);
+                            parsing = args.equalsIgnoreCase(reader.getAppName());
                         }
                     } else if ("else".equalsIgnoreCase(cmd)) {
                         if (ifsStack.isEmpty()) {

diff --git a/builtins/src/test/java/org/jline/builtins/InputRCTest.java b/builtins/src/test/java/org/jline/builtins/InputRCTest.java
@@ -53,7 +53,7 @@ private LineReader createReader(String appName, String config) throws IOExceptio
                 .terminal(TerminalBuilder.builder().streams(new ByteArrayInputStream(new byte[0]), new ByteArrayOutputStream()).build())
                 .appName(appName)
                 .build();
-        InputRC.configure(lr, appName, getClass().getResource(config));
+        InputRC.configure(lr, getClass().getResource(config));
         return lr;
     }
 

diff --git a/reader/src/main/java/org/jline/reader/LineReader.java b/reader/src/main/java/org/jline/reader/LineReader.java
@@ -536,6 +536,8 @@ enum RegionType {
 
     Buffer getBuffer();
 
+    String getAppName();
+
     /**
      * Push back a key sequence that will be later consumed by the line reader.
      * This method can be used after reading the cursor position using