From c0053ceef55a2b0e325d0340baa47185ad4774b0 Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Tue, 23 Jul 2019 17:51:02 -0700
Subject: [PATCH] highlighter_t to return color array directly

Saves some copying and allocations.
---
 src/highlight.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/highlight.cpp b/src/highlight.cpp
index 0924407d4..a79a17b4c 100644
--- a/src/highlight.cpp
+++ b/src/highlight.cpp
@@ -798,7 +798,7 @@ class highlighter_t {
     }
 
     // Perform highlighting, returning an array of colors.
-    const color_array_t &highlight();
+    color_array_t highlight();
 };
 
 void highlighter_t::color_node(const parse_node_t &node, highlight_spec_t color) {
@@ -1114,7 +1114,7 @@ static bool command_is_valid(const wcstring &cmd, enum parse_statement_decoratio
     return is_valid;
 }
 
-const highlighter_t::color_array_t &highlighter_t::highlight() {
+highlighter_t::color_array_t highlighter_t::highlight() {
     // If we are doing I/O, we must be in a background thread.
     if (io_ok) {
         ASSERT_IS_BACKGROUND_THREAD();
@@ -1254,7 +1254,7 @@ const highlighter_t::color_array_t &highlighter_t::highlight() {
     }
 
     if (!this->io_ok || this->cursor_pos > this->buff.size()) {
-        return color_array;
+        return std::move(color_array);
     }
 
     // If the cursor is over an argument, and that argument is a valid path, underline it.
@@ -1278,7 +1278,7 @@ const highlighter_t::color_array_t &highlighter_t::highlight() {
         }
     }
 
-    return color_array;
+    return std::move(color_array);
 }
 
 void highlight_shell(const wcstring &buff, std::vector<highlight_spec_t> &color, size_t pos,