From 905c292a81b08a56acb464680ba6a2590297e525 Mon Sep 17 00:00:00 2001
From: Dialga <Dialga@users.noreply.github.com>
Date: Tue, 7 Sep 2021 11:21:23 +1200
Subject: [PATCH] tmpl: enforce stricter line checking for html interpolation
 (#11413)

---
 vlib/v/parser/tmpl.v                          | 6 +++---
 vlib/v/tests/inout/file.md                    | 1 +
 vlib/v/tests/inout/tmpl_all_in_one_folder.out | 1 +
 vlib/v/tests/inout/tmpl_all_in_one_folder.vv  | 7 +++++++
 4 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/vlib/v/parser/tmpl.v b/vlib/v/parser/tmpl.v
index 548e913f87..ed373fa9a9 100644
--- a/vlib/v/parser/tmpl.v
+++ b/vlib/v/parser/tmpl.v
@@ -193,16 +193,16 @@ mut sb := strings.new_builder($lstartlength)\n
 			pos := line.index('@for') or { continue }
 			source.writeln('for ' + line[pos + 4..] + '{')
 			source.writeln(parser.tmpl_str_start)
-		} else if state == .html && line.contains('span.') && line.ends_with('{') {
+		} else if state == .html && line.starts_with('span.') && line.ends_with('{') {
 			// `span.header {` => `<span class='header'>`
 			class := line.find_between('span.', '{').trim_space()
 			source.writeln('<span class="$class">')
 			in_span = true
-		} else if state == .html && line.contains('.') && line.ends_with('{') {
+		} else if state == .html && line.starts_with('.') && line.ends_with('{') {
 			// `.header {` => `<div class='header'>`
 			class := line.find_between('.', '{').trim_space()
 			source.writeln('<div class="$class">')
-		} else if state == .html && line.contains('#') && line.ends_with('{') {
+		} else if state == .html && line.starts_with('#') && line.ends_with('{') {
 			// `#header {` => `<div id='header'>`
 			class := line.find_between('#', '{').trim_space()
 			source.writeln('<div id="$class">')
diff --git a/vlib/v/tests/inout/file.md b/vlib/v/tests/inout/file.md
index ba3fc2f445..e22eaa683a 100644
--- a/vlib/v/tests/inout/file.md
+++ b/vlib/v/tests/inout/file.md
@@ -3,6 +3,7 @@
 This is the main content:
 -------------------------
 @content
+Name: @{p1.name}
 -------------------------
 
 @include './footer.md'
diff --git a/vlib/v/tests/inout/tmpl_all_in_one_folder.out b/vlib/v/tests/inout/tmpl_all_in_one_folder.out
index 649f5915af..7970222bb1 100644
--- a/vlib/v/tests/inout/tmpl_all_in_one_folder.out
+++ b/vlib/v/tests/inout/tmpl_all_in_one_folder.out
@@ -3,6 +3,7 @@ my header
 This is the main content:
 -------------------------
 some string
+Name: Peter
 -------------------------
 
 my footer
diff --git a/vlib/v/tests/inout/tmpl_all_in_one_folder.vv b/vlib/v/tests/inout/tmpl_all_in_one_folder.vv
index 30aaf6971d..4ffd20bbc6 100644
--- a/vlib/v/tests/inout/tmpl_all_in_one_folder.vv
+++ b/vlib/v/tests/inout/tmpl_all_in_one_folder.vv
@@ -1,4 +1,11 @@
+struct Person {
+mut:
+	name string
+}
+
 fn abc() string {
+	mut p1 := Person{}
+	p1.name = 'Peter'
 	content := 'some string'
 	return $tmpl('file.md')
 }