Merge branch 'master' of https://github.com/jline/jline3.git

Conflicts: reader/src/main/java/org/jline/reader/impl/DefaultParser.java reader/src/test/java/org/jline/reader/completer/StringsCompleterTest.java
jline · Nov 26, 2018 · f2e7070 · f2e7070
2 parents 12ad62c + 7783c03
commit f2e7070
Show file tree

Hide file tree

Showing 216 changed files with 323 additions and 287 deletions.
diff --git a/LICENSE.txt b/LICENSE.txt
@@ -1,7 +1,7 @@
 Copyright (c) 2002-2018, the original author or authors.
 All rights reserved.
 
-http://www.opensource.org/licenses/bsd-license.php
+https://opensource.org/licenses/BSD-3-Clause
 
 Redistribution and use in source and binary forms, with or
 without modification, are permitted provided that the following

diff --git a/README.md b/README.md
@@ -5,10 +5,10 @@
     This software is distributable under the BSD license. See the terms of the
     BSD license in the documentation provided with this software.
 
-    http://www.opensource.org/licenses/bsd-license.php
+    https://opensource.org/licenses/BSD-3-Clause
 
 -->
-# JLine [![License](https://img.shields.io/badge/License-BSD%202--Clause-orange.svg)](https://opensource.org/licenses/BSD-2-Clause) [![Maven Central](https://maven-badges.herokuapp.com/maven-central/org.jline/jline/badge.svg)](https://maven-badges.herokuapp.com/maven-central/org.jline/jline) [![Build Status: Linux](https://travis-ci.org/jline/jline3.svg?branch=master)](https://travis-ci.org/jline/jline3) [![Build Status: Windows](https://ci.appveyor.com/api/projects/status/github/jline/jline3?svg=true)](https://ci.appveyor.com/project/gnodet/jline3) [![DepShield Badge](https://depshield.sonatype.org/badges/jline/jline3/depshield.svg)](https://depshield.github.io)
+# JLine [![License](https://img.shields.io/badge/License-BSD%202--Clause-orange.svg)](https://opensource.org/licenses/BSD-3-Clause) [![Maven Central](https://maven-badges.herokuapp.com/maven-central/org.jline/jline/badge.svg)](https://maven-badges.herokuapp.com/maven-central/org.jline/jline) [![Build Status: Linux](https://travis-ci.org/jline/jline3.svg?branch=master)](https://travis-ci.org/jline/jline3) [![Build Status: Windows](https://ci.appveyor.com/api/projects/status/github/jline/jline3?svg=true)](https://ci.appveyor.com/project/gnodet/jline3) [![DepShield Badge](https://depshield.sonatype.org/badges/jline/jline3/depshield.svg)](https://depshield.github.io)
 
 
 JLine is a Java library for handling console input. It is similar in functionality to [BSD editline](http://www.thrysoee.dk/editline/) and [GNU readline](http://www.gnu.org/s/readline/) but with additional features that bring it in par with [ZSH line editor](http://zsh.sourceforge.net/Doc/Release/Zsh-Line-Editor.html). People familiar with the readline/editline capabilities for modern shells (such as bash and tcsh) will find most of the command editing features of JLine to be familiar.
@@ -17,7 +17,7 @@ JLine 3.x is an evolution of [JLine 2.x](https://github.com/jline/jline2).
 
 # License
 
-JLine is distributed under the [BSD License](http://www.opensource.org/licenses/bsd-license.php), meaning that you are completely free to redistribute, modify, or sell it with almost no restrictions.
+JLine is distributed under the [BSD License](https://opensource.org/licenses/BSD-3-Clause), meaning that you are completely free to redistribute, modify, or sell it with almost no restrictions.
 
 # Documentation
 
@@ -131,7 +131,7 @@ The finer grained bundles are located at:
 
 Maven has a concept of `SNAPSHOT`. During development, the jline version will always ends with `-SNAPSHOT`, which means that the version is in development and not a release.
 
-Note that all those artifacts are also installed in the local maven repostitory, so you will usually find them in the following folder: `~/.m2/repository/org/jline/`.
+Note that all those artifacts are also installed in the local maven repository, so you will usually find them in the following folder: `~/.m2/repository/org/jline/`.
 
 ## Running the demo
 

diff --git a/builtins/pom.xml b/builtins/pom.xml
@@ -6,7 +6,7 @@
     This software is distributable under the BSD license. See the terms of the
     BSD license in the documentation provided with this software.
 
-    http://www.opensource.org/licenses/bsd-license.php
+    https://opensource.org/licenses/BSD-3-Clause
 
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">

diff --git a/builtins/src/main/java/org/jline/builtins/Commands.java b/builtins/src/main/java/org/jline/builtins/Commands.java
@@ -4,7 +4,7 @@
  * This software is distributable under the BSD license. See the terms of the
  * BSD license in the documentation provided with this software.
  *
- * http://www.opensource.org/licenses/bsd-license.php
+ * https://opensource.org/licenses/BSD-3-Clause
  */
 package org.jline.builtins;
 

diff --git a/builtins/src/main/java/org/jline/builtins/Completers.java b/builtins/src/main/java/org/jline/builtins/Completers.java
@@ -4,7 +4,7 @@
  * This software is distributable under the BSD license. See the terms of the
  * BSD license in the documentation provided with this software.
  *
- * http://www.opensource.org/licenses/bsd-license.php
+ * https://opensource.org/licenses/BSD-3-Clause
  */
 package org.jline.builtins;
 

diff --git a/builtins/src/main/java/org/jline/builtins/InputRC.java b/builtins/src/main/java/org/jline/builtins/InputRC.java
@@ -4,7 +4,7 @@
  * This software is distributable under the BSD license. See the terms of the
  * BSD license in the documentation provided with this software.
  *
- * http://www.opensource.org/licenses/bsd-license.php
+ * https://opensource.org/licenses/BSD-3-Clause
  */
 package org.jline.builtins;
 

diff --git a/builtins/src/main/java/org/jline/builtins/Less.java b/builtins/src/main/java/org/jline/builtins/Less.java
@@ -4,7 +4,7 @@
  * This software is distributable under the BSD license. See the terms of the
  * BSD license in the documentation provided with this software.
  *
- * http://www.opensource.org/licenses/bsd-license.php
+ * https://opensource.org/licenses/BSD-3-Clause
  */
 package org.jline.builtins;
 

diff --git a/builtins/src/main/java/org/jline/builtins/Nano.java b/builtins/src/main/java/org/jline/builtins/Nano.java
@@ -4,7 +4,7 @@
  * This software is distributable under the BSD license. See the terms of the
  * BSD license in the documentation provided with this software.
  *
- * http://www.opensource.org/licenses/bsd-license.php
+ * https://opensource.org/licenses/BSD-3-Clause
  */
 package org.jline.builtins;
 
@@ -1473,7 +1473,6 @@ private LinkedHashMap<String, String> standardShortcuts() {
         s.put("^G", "Get Help");
         s.put("^O", "WriteOut");
         s.put("^R", "Read File");
-        s.put("^O", "WriteOut");
         s.put("^Y", "Prev Page");
         s.put("^K", "Cut Text");
         s.put("^C", "Cur Pos");
@@ -1552,6 +1551,7 @@ void help(String help) {
     void search() throws IOException {
         KeyMap<Operation> searchKeyMap = new KeyMap<>();
         searchKeyMap.setUnicode(Operation.INSERT);
+        searchKeyMap.setNomatch(Operation.INSERT);
         for (char i = 'A'; i <= 'Z'; i++) {
             searchKeyMap.bind(Operation.DO_LOWER_CASE, alt(i));
         }

diff --git a/builtins/src/main/java/org/jline/builtins/NfaMatcher.java b/builtins/src/main/java/org/jline/builtins/NfaMatcher.java
@@ -4,7 +4,7 @@
  * This software is distributable under the BSD license. See the terms of the
  * BSD license in the documentation provided with this software.
  *
- * http://www.opensource.org/licenses/bsd-license.php
+ * https://opensource.org/licenses/BSD-3-Clause
  */
 package org.jline.builtins;
 

diff --git a/builtins/src/main/java/org/jline/builtins/Options.java b/builtins/src/main/java/org/jline/builtins/Options.java
@@ -4,7 +4,7 @@
  * This software is distributable under the BSD license. See the terms of the
  * BSD license in the documentation provided with this software.
  *
- * http://www.opensource.org/licenses/bsd-license.php
+ * https://opensource.org/licenses/BSD-3-Clause
  */
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

diff --git a/builtins/src/main/java/org/jline/builtins/ScreenTerminal.java b/builtins/src/main/java/org/jline/builtins/ScreenTerminal.java
@@ -4,7 +4,7 @@
  * This software is distributable under the BSD license. See the terms of the
  * BSD license in the documentation provided with this software.
  *
- * http://www.opensource.org/licenses/bsd-license.php
+ * https://opensource.org/licenses/BSD-3-Clause
  */
 
 /*

diff --git a/builtins/src/main/java/org/jline/builtins/Source.java b/builtins/src/main/java/org/jline/builtins/Source.java
@@ -4,7 +4,7 @@
  * This software is distributable under the BSD license. See the terms of the
  * BSD license in the documentation provided with this software.
  *
- * http://www.opensource.org/licenses/bsd-license.php
+ * https://opensource.org/licenses/BSD-3-Clause
  */
 package org.jline.builtins;
 

diff --git a/builtins/src/main/java/org/jline/builtins/TTop.java b/builtins/src/main/java/org/jline/builtins/TTop.java
@@ -4,7 +4,7 @@
  * This software is distributable under the BSD license. See the terms of the
  * BSD license in the documentation provided with this software.
  *
- * http://www.opensource.org/licenses/bsd-license.php
+ * https://opensource.org/licenses/BSD-3-Clause
  */
 package org.jline.builtins;
 

diff --git a/builtins/src/main/java/org/jline/builtins/Tmux.java b/builtins/src/main/java/org/jline/builtins/Tmux.java
@@ -4,7 +4,7 @@
  * This software is distributable under the BSD license. See the terms of the
  * BSD license in the documentation provided with this software.
  *
- * http://www.opensource.org/licenses/bsd-license.php
+ * https://opensource.org/licenses/BSD-3-Clause
  */
 package org.jline.builtins;
 

diff --git a/builtins/src/test/java/org/jline/builtins/CompletersTest.java b/builtins/src/test/java/org/jline/builtins/CompletersTest.java
@@ -4,7 +4,7 @@
  * This software is distributable under the BSD license. See the terms of the
  * BSD license in the documentation provided with this software.
  *
- * http://www.opensource.org/licenses/bsd-license.php
+ * https://opensource.org/licenses/BSD-3-Clause
  */
 package org.jline.builtins;
 

diff --git a/builtins/src/test/java/org/jline/builtins/InputRCTest.java b/builtins/src/test/java/org/jline/builtins/InputRCTest.java
@@ -4,7 +4,7 @@
  * This software is distributable under the BSD license. See the terms of the
  * BSD license in the documentation provided with this software.
  *
- * http://www.opensource.org/licenses/bsd-license.php
+ * https://opensource.org/licenses/BSD-3-Clause
  */
 package org.jline.builtins;
 

diff --git a/builtins/src/test/java/org/jline/builtins/NanoTest.java b/builtins/src/test/java/org/jline/builtins/NanoTest.java
@@ -4,7 +4,7 @@
  * This software is distributable under the BSD license. See the terms of the
  * BSD license in the documentation provided with this software.
  *
- * http://www.opensource.org/licenses/bsd-license.php
+ * https://opensource.org/licenses/BSD-3-Clause
  */
 package org.jline.builtins;
 

diff --git a/builtins/src/test/java/org/jline/builtins/NfaMatcherTest.java b/builtins/src/test/java/org/jline/builtins/NfaMatcherTest.java
@@ -4,7 +4,7 @@
  * This software is distributable under the BSD license. See the terms of the
  * BSD license in the documentation provided with this software.
  *
- * http://www.opensource.org/licenses/bsd-license.php
+ * https://opensource.org/licenses/BSD-3-Clause
  */
 package org.jline.builtins;
 

diff --git a/builtins/src/test/java/org/jline/builtins/OptionsTest.java b/builtins/src/test/java/org/jline/builtins/OptionsTest.java
@@ -4,7 +4,7 @@
  * This software is distributable under the BSD license. See the terms of the
  * BSD license in the documentation provided with this software.
  *
- * http://www.opensource.org/licenses/bsd-license.php
+ * https://opensource.org/licenses/BSD-3-Clause
  */
 
 /*

diff --git a/builtins/src/test/java/org/jline/builtins/ReaderTestSupport.java b/builtins/src/test/java/org/jline/builtins/ReaderTestSupport.java
@@ -4,7 +4,7 @@
  * This software is distributable under the BSD license. See the terms of the
  * BSD license in the documentation provided with this software.
  *
- * http://www.opensource.org/licenses/bsd-license.php
+ * https://opensource.org/licenses/BSD-3-Clause
  */
 package org.jline.builtins;
 

diff --git a/builtins/src/test/java/org/jline/builtins/TmuxTest.java b/builtins/src/test/java/org/jline/builtins/TmuxTest.java
@@ -4,7 +4,7 @@
  * This software is distributable under the BSD license. See the terms of the
  * BSD license in the documentation provided with this software.
  *
- * http://www.opensource.org/licenses/bsd-license.php
+ * https://opensource.org/licenses/BSD-3-Clause
  */
 package org.jline.builtins;
 

diff --git a/builtins/src/test/java/org/jline/builtins/TreeCompleterTest.java b/builtins/src/test/java/org/jline/builtins/TreeCompleterTest.java
@@ -4,7 +4,7 @@
  * This software is distributable under the BSD license. See the terms of the
  * BSD license in the documentation provided with this software.
  *
- * http://www.opensource.org/licenses/bsd-license.php
+ * https://opensource.org/licenses/BSD-3-Clause
  */
 package org.jline.builtins;
 

diff --git a/builtins/src/test/java/org/jline/example/ArgumentMaskCallbackReader.java b/builtins/src/test/java/org/jline/example/ArgumentMaskCallbackReader.java
@@ -4,7 +4,7 @@
  * This software is distributable under the BSD license. See the terms of the
  * BSD license in the documentation provided with this software.
  *
- * http://www.opensource.org/licenses/bsd-license.php
+ * https://opensource.org/licenses/BSD-3-Clause
  */
 package org.jline.example;
 

diff --git a/builtins/src/test/java/org/jline/example/Example.java b/builtins/src/test/java/org/jline/example/Example.java
@@ -4,7 +4,7 @@
  * This software is distributable under the BSD license. See the terms of the
  * BSD license in the documentation provided with this software.
  *
- * http://www.opensource.org/licenses/bsd-license.php
+ * https://opensource.org/licenses/BSD-3-Clause
  */
 package org.jline.example;
 

diff --git a/builtins/src/test/java/org/jline/example/OptionMaskCallbackReader.java b/builtins/src/test/java/org/jline/example/OptionMaskCallbackReader.java
@@ -4,7 +4,7 @@
  * This software is distributable under the BSD license. See the terms of the
  * BSD license in the documentation provided with this software.
  *
- * http://www.opensource.org/licenses/bsd-license.php
+ * https://opensource.org/licenses/BSD-3-Clause
  */
 package org.jline.example;
 

diff --git a/builtins/src/test/java/org/jline/example/PasswordReader.java b/builtins/src/test/java/org/jline/example/PasswordReader.java
@@ -4,7 +4,7 @@
  * This software is distributable under the BSD license. See the terms of the
  * BSD license in the documentation provided with this software.
  *
- * http://www.opensource.org/licenses/bsd-license.php
+ * https://opensource.org/licenses/BSD-3-Clause
  */
 
 package org.jline.example;

diff --git a/demo/pom.xml b/demo/pom.xml
@@ -6,7 +6,7 @@
     This software is distributable under the BSD license. See the terms of the
     BSD license in the documentation provided with this software.
 
-    http://www.opensource.org/licenses/bsd-license.php
+    https://opensource.org/licenses/BSD-3-Clause
 
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">

diff --git a/demo/src/main/java/org/jline/demo/FunctionConverter.java b/demo/src/main/java/org/jline/demo/FunctionConverter.java
@@ -4,7 +4,7 @@
  * This software is distributable under the BSD license. See the terms of the
  * BSD license in the documentation provided with this software.
  *
- * http://www.opensource.org/licenses/bsd-license.php
+ * https://opensource.org/licenses/BSD-3-Clause
  */
 package org.jline.demo;
 

diff --git a/demo/src/main/java/org/jline/demo/Gogo.java b/demo/src/main/java/org/jline/demo/Gogo.java
@@ -4,7 +4,7 @@
  * This software is distributable under the BSD license. See the terms of the
  * BSD license in the documentation provided with this software.
  *
- * http://www.opensource.org/licenses/bsd-license.php
+ * https://opensource.org/licenses/BSD-3-Clause
  */
 package org.jline.demo;
 

diff --git a/header.txt b/header.txt
@@ -3,4 +3,4 @@ Copyright (c) 2002-2017, the original author or authors.
 This software is distributable under the BSD license. See the terms of the
 BSD license in the documentation provided with this software.
 
-http://www.opensource.org/licenses/bsd-license.php
+https://opensource.org/licenses/BSD-3-Clause
diff --git a/jline/pom.xml b/jline/pom.xml
@@ -6,7 +6,7 @@
     This software is distributable under the BSD license. See the terms of the
     BSD license in the documentation provided with this software.
 
-    http://www.opensource.org/licenses/bsd-license.php
+    https://opensource.org/licenses/BSD-3-Clause
 
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">

diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
     This software is distributable under the BSD license. See the terms of the
     BSD license in the documentation provided with this software.
 
-    http://www.opensource.org/licenses/bsd-license.php
+    https://opensource.org/licenses/BSD-3-Clause
 
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
@@ -29,7 +29,7 @@
     <licenses>
         <license>
             <name>The BSD License</name>
-            <url>http://www.opensource.org/licenses/bsd-license.php</url>
+            <url>https://opensource.org/licenses/BSD-3-Clause</url>
             <distribution>repo</distribution>
         </license>
     </licenses>

diff --git a/reader/pom.xml b/reader/pom.xml
@@ -6,7 +6,7 @@
     This software is distributable under the BSD license. See the terms of the
     BSD license in the documentation provided with this software.
 
-    http://www.opensource.org/licenses/bsd-license.php
+    https://opensource.org/licenses/BSD-3-Clause
 
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">

diff --git a/reader/src/main/java/org/jline/keymap/BindingReader.java b/reader/src/main/java/org/jline/keymap/BindingReader.java
@@ -4,7 +4,7 @@
  * This software is distributable under the BSD license. See the terms of the
  * BSD license in the documentation provided with this software.
  *
- * http://www.opensource.org/licenses/bsd-license.php
+ * https://opensource.org/licenses/BSD-3-Clause
  */
 package org.jline.keymap;
 

diff --git a/reader/src/main/java/org/jline/keymap/KeyMap.java b/reader/src/main/java/org/jline/keymap/KeyMap.java
@@ -4,7 +4,7 @@
  * This software is distributable under the BSD license. See the terms of the
  * BSD license in the documentation provided with this software.
  *
- * http://www.opensource.org/licenses/bsd-license.php
+ * https://opensource.org/licenses/BSD-3-Clause
  */
 package org.jline.keymap;
 

diff --git a/reader/src/main/java/org/jline/reader/Binding.java b/reader/src/main/java/org/jline/reader/Binding.java
@@ -4,7 +4,7 @@
  * This software is distributable under the BSD license. See the terms of the
  * BSD license in the documentation provided with this software.
  *
- * http://www.opensource.org/licenses/bsd-license.php
+ * https://opensource.org/licenses/BSD-3-Clause
  */
 package org.jline.reader;
 

diff --git a/reader/src/main/java/org/jline/reader/Buffer.java b/reader/src/main/java/org/jline/reader/Buffer.java
@@ -4,7 +4,7 @@
  * This software is distributable under the BSD license. See the terms of the
  * BSD license in the documentation provided with this software.
  *
- * http://www.opensource.org/licenses/bsd-license.php
+ * https://opensource.org/licenses/BSD-3-Clause
  */
 package org.jline.reader;
 

diff --git a/reader/src/main/java/org/jline/reader/Candidate.java b/reader/src/main/java/org/jline/reader/Candidate.java
@@ -4,7 +4,7 @@
  * This software is distributable under the BSD license. See the terms of the
  * BSD license in the documentation provided with this software.
  *
- * http://www.opensource.org/licenses/bsd-license.php
+ * https://opensource.org/licenses/BSD-3-Clause
  */
 package org.jline.reader;
 

diff --git a/reader/src/main/java/org/jline/reader/Completer.java b/reader/src/main/java/org/jline/reader/Completer.java
@@ -4,7 +4,7 @@
  * This software is distributable under the BSD license. See the terms of the
  * BSD license in the documentation provided with this software.
  *
- * http://www.opensource.org/licenses/bsd-license.php
+ * https://opensource.org/licenses/BSD-3-Clause
  */
 package org.jline.reader;