Bugfix: properly handle comments in colors {} blocks of bar config (+test) (Thanks...

[i3/i3] / src / cfgparse.l

diff --git a/src/cfgparse.l b/src/cfgparse.l
index 2bab9d6a40dcea931bdaa2f50c5f3d73f60b5a43..1f584c327196476b31511391599885d3ef76c0ed 100644 (file)
--- a/src/cfgparse.l
+++ b/src/cfgparse.l
@@ -106,6 +106,7 @@ EOL     (\r?\n)
 <BAR>colors                     { yy_push_state(BAR_COLORS); return TOK_BAR_COLORS; }
 <BAR_COLORS>"{"                 { return '{'; }
 <BAR_COLORS>"}"                 { yy_pop_state(); return '}'; }
+<BAR_COLORS>^[ \t]*#[^\n]*      { return TOKCOMMENT; }
 <BAR_COLORS>background          { yy_push_state(BAR_COLOR); return TOK_BAR_COLOR_BACKGROUND; }
 <BAR_COLORS>statusline          { yy_push_state(BAR_COLOR); return TOK_BAR_COLOR_STATUSLINE; }
 <BAR_COLORS>focused_workspace   { BAR_DOUBLE_COLOR; return TOK_BAR_COLOR_FOCUSED_WORKSPACE; }