Ignore underlong completions.

AmokHuginnsson · Jun 6, 2020 · ffd76db · ffd76db
1 parent 737c8e8
commit ffd76db
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/src/replxx_impl.cxx b/src/replxx_impl.cxx
@@ -349,8 +349,12 @@ Replxx::ReplxxImpl::completions_t Replxx::ReplxxImpl::call_completer( std::strin
 	);
 	completions_t completions;
 	completions.reserve( completionsIntermediary.size() );
-	for ( Replxx::Completion const& c : completionsIntermediary ) {
-		completions.emplace_back( c );
+	for ( Replxx::Completion const& external : completionsIntermediary ) {
+		Completion internal( external );
+		if ( internal.text().length() < contextLen_ ) {
+			continue;
+		}
+		completions.emplace_back( internal );
 	}
 	return ( completions );
 }
@@ -1948,7 +1952,7 @@ Replxx::ACTION_RESULT Replxx::ReplxxImpl::bracketed_paste( char32_t ) {
 		if ( c == KEY::PASTE_FINISH ) {
 			break;
 		}
-		if ( c == '\r' ) {
+		if ( ( c == '\r' ) || ( c == KEY::control( 'M' ) ) ) {
 			c = '\n';
 		}
 		buf.push_back( c );

diff --git a/tests.py b/tests.py
@@ -579,8 +579,8 @@ def test_tab_completion( self_ ):
 	def test_completion_shorter_result( self_ ):
 		self_.check_scenario(
 			"<up><tab><cr><c-d>",
-			"<c9>\\pi<rst><ceos><c12><c9>π<rst><ceos><c10><c9>π<rst><ceos><c10>\r\n"
-			"π\r\n",
+			"<c9>\\pi<rst><ceos><c12><bell><c9>\\pi<rst><ceos><c12>\r\n"
+			"\\pi\r\n",
 			"\\pi\n"
 		)
 	def test_completion_pager( self_ ):