From 6fc46fbb177e22d467c9d92d0fac8581afa81246 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Sat, 11 Jan 2020 13:32:30 +0100
Subject: [PATCH] lib/types: only show ... in loaOf warning when necessary

---
 lib/types.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/lib/types.nix b/lib/types.nix
index cbbea00058d0..6eebc20829c6 100644
--- a/lib/types.nix
+++ b/lib/types.nix
@@ -354,6 +354,7 @@ rec {
                 };
               option = concatStringsSep "." loc;
               sample = take 3 def.value;
+              more = lib.optionalString (length def.value > 3) "... ";
               list = concatMapStrings (x: ''{ ${nameAttr} = "${x.${nameAttr} or "unnamed"}"; ...} '') sample;
               set = concatMapStrings (x: ''${x.${nameAttr} or "unnamed"} = {...}; '') sample;
               msg = ''
@@ -363,10 +364,10 @@ rec {
                 See https://git.io/fj2zm for more information.
                 Do
                   ${option} =
-                    { ${set}...}
+                    { ${set}${more}}
                 instead of
                   ${option} =
-                    [ ${list}...]
+                    [ ${list}${more}]
               '';
             in
               lib.warn msg res