Home Explore Help
Register Sign In
publics
/
net
0
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

html: don't ignore the token if the current node is form

See: https://html.spec.whatwg.org/multipage/parsing.html#parsing-main-inbody

Fixes golang/go#25703
Updates golang/go#23071

Change-Id: I09db4c2d07a242cb45c3e37b499c609809dd0b83
Reviewed-on: https://go-review.googlesource.com/120658
Run-TryBot: Kunpei Sakai <namusyaka@gmail.com>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Nigel Tao <nigeltao@golang.org>
Kunpei Sakai 7 years ago
parent
7d20a46f6b
commit
32a936f463
3 changed files with 43 additions and 23 deletions
Unified View Show Diff Stats
  1. 10 5
      html/parse.go
  2. 20 18
      html/parse_test.go
  3. 13 0
      html/testdata/go/template.dat

+ 10 - 5
html/parse.go
View File 

@@ -860,9 +860,13 @@ func inBodyIM(p *parser) bool {
 
 			// The newline, if any, will be dealt with by the TextToken case.
 
 			// The newline, if any, will be dealt with by the TextToken case.
 
 			p.framesetOK = false
 
 			p.framesetOK = false
 
 		case a.Form:
 
 		case a.Form:
 
-			if p.oe.contains(a.Template) || p.form == nil {
 
-				p.popUntil(buttonScope, a.P)
 
-				p.addElement()
 
+			if p.form != nil && !p.oe.contains(a.Template) {
 
+				// Ignore the token
 
+				return true
 
+			}
 
+			p.popUntil(buttonScope, a.P)
 
+			p.addElement()
 
+			if !p.oe.contains(a.Template) {
 
 				p.form = p.top()
 
 				p.form = p.top()
 
 			}
 
 			}
 
 		case a.Li:
 
 		case a.Li:
 
@@ -1098,12 +1102,13 @@ func inBodyIM(p *parser) bool {
 
 			p.popUntil(defaultScope, p.tok.DataAtom)
 
 			p.popUntil(defaultScope, p.tok.DataAtom)
 
 		case a.Form:
 
 		case a.Form:
 
 			if p.oe.contains(a.Template) {
 
 			if p.oe.contains(a.Template) {
 
-				if !p.oe.contains(a.Form) {
 
+				i := p.indexOfElementInScope(defaultScope, a.Form)
 
+				if i == -1 {
 
 					// Ignore the token.
 
 					// Ignore the token.
 
 					return true
 
 					return true
 
 				}
 
 				}
 
 				p.generateImpliedEndTags()
 
 				p.generateImpliedEndTags()
 
-				if p.tok.DataAtom == a.Form {
 
+				if p.oe[i].DataAtom != a.Form {
 
 					// Ignore the token.
 
 					// Ignore the token.
 
 					return true
 
 					return true
 
 				}
 
 				}

+ 20 - 18
html/parse_test.go
View File 

@@ -203,34 +203,36 @@ func dump(n *Node) (string, error) {
 
 	return b.String(), nil
 
 	return b.String(), nil
 
 }
 
 }
 
 
 
-const testDataDir = "testdata/webkit/"
 
+var testDataDirs = []string{"testdata/webkit/", "testdata/go/"}
 
 
 
 func TestParser(t *testing.T) {
 
 func TestParser(t *testing.T) {
 
-	testFiles, err := filepath.Glob(testDataDir + "*.dat")
 
-	if err != nil {
 
-		t.Fatal(err)
 
-	}
 
-	for _, tf := range testFiles {
 
-		f, err := os.Open(tf)
 
+	for _, testDataDir := range testDataDirs {
 
+		testFiles, err := filepath.Glob(testDataDir + "*.dat")
 
 		if err != nil {
 
 		if err != nil {
 
 			t.Fatal(err)
 
 			t.Fatal(err)
 
 		}
 
 		}
 
-		defer f.Close()
 
-		r := bufio.NewReader(f)
 
-
 
-		for i := 0; ; i++ {
 
-			text, want, context, err := readParseTest(r)
 
-			if err == io.EOF {
 
-				break
 
-			}
 
+		for _, tf := range testFiles {
 
+			f, err := os.Open(tf)
 
 			if err != nil {
 
 			if err != nil {
 
 				t.Fatal(err)
 
 				t.Fatal(err)
 
 			}
 
 			}
 
+			defer f.Close()
 
+			r := bufio.NewReader(f)
 
 
 
-			err = testParseCase(text, want, context)
 
+			for i := 0; ; i++ {
 
+				text, want, context, err := readParseTest(r)
 
+				if err == io.EOF {
 
+					break
 
+				}
 
+				if err != nil {
 
+					t.Fatal(err)
 
+				}
 
 
 
-			if err != nil {
 
-				t.Errorf("%s test #%d %q, %s", tf, i, text, err)
 
+				err = testParseCase(text, want, context)
 
+
 
+				if err != nil {
 
+					t.Errorf("%s test #%d %q, %s", tf, i, text, err)
 
+				}
 
 			}
 
 			}
 
 		}
 
 		}
 
 	}
 
 	}

+ 13 - 0
html/testdata/go/template.dat
View File 

@@ -0,0 +1,13 @@
 
+#data
 
+<body><template><yt-icon-button></yt-icon-button><form><paper-input></paper-input></form><style></style></template>
 
+#errors
 
+#document
 
+| <html>
 
+|   <head>
 
+|   <body>
 
+|     <template>
 
+|       content
 
+|         <yt-icon-button>
 
+|         <form>
 
+|           <paper-input>
 
+|         <style>