From 7baf9b3f357abe314fcd02e01c814f9516d66e89 Mon Sep 17 00:00:00 2001
From: Joel Challis <git@zvecr.com>
Date: Fri, 10 Jun 2022 11:44:23 +0100
Subject: Promote label with newlines to lint error (#17347)

---
 lib/python/qmk/info.py | 10 ----------
 1 file changed, 10 deletions(-)

(limited to 'lib/python/qmk/info.py')

diff --git a/lib/python/qmk/info.py b/lib/python/qmk/info.py
index 6ff9cba45b..dd753f328c 100644
--- a/lib/python/qmk/info.py
+++ b/lib/python/qmk/info.py
@@ -26,13 +26,6 @@ def _valid_community_layout(layout):
     return (Path('layouts/default') / layout).exists()
 
 
-def _remove_newlines_from_labels(layouts):
-    for layout_name, layout_json in layouts.items():
-        for key in layout_json['layout']:
-            if '\n' in key['label']:
-                key['label'] = key['label'].split('\n')[0]
-
-
 def info_json(keyboard):
     """Generate the info.json data for a specific keyboard.
     """
@@ -111,9 +104,6 @@ def info_json(keyboard):
     # Check that the reported matrix size is consistent with the actual matrix size
     _check_matrix(info_data)
 
-    # Remove newline characters from layout labels
-    _remove_newlines_from_labels(layouts)
-
     return info_data
 
 
-- 
cgit v1.2.3


From 92665aef33148fef051ad07687028c88f0da64fc Mon Sep 17 00:00:00 2001
From: Joel Challis <git@zvecr.com>
Date: Fri, 10 Jun 2022 11:44:48 +0100
Subject: Promote 'layouts require matrix data' to api error (#17349)

---
 lib/python/qmk/info.py | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'lib/python/qmk/info.py')

diff --git a/lib/python/qmk/info.py b/lib/python/qmk/info.py
index dd753f328c..23761d71b7 100644
--- a/lib/python/qmk/info.py
+++ b/lib/python/qmk/info.py
@@ -797,8 +797,11 @@ def merge_info_jsons(keyboard, info_data):
                     for new_key, existing_key in zip(layout['layout'], info_data['layouts'][layout_name]['layout']):
                         existing_key.update(new_key)
             else:
-                layout['c_macro'] = False
-                info_data['layouts'][layout_name] = layout
+                if not all('matrix' in key_data.keys() for key_data in layout['layout']):
+                    _log_error(info_data, f'Layout "{layout_name}" has no "matrix" definition in either "info.json" or "<keyboard>.h"!')
+                else:
+                    layout['c_macro'] = False
+                    info_data['layouts'][layout_name] = layout
 
         # Update info_data with the new data
         if 'layouts' in new_info_data:
-- 
cgit v1.2.3