tools/idl_parser/test_parser/interface_web.idl - Issue 1001833005: Update from https://crrev.com/320343

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: tools/idl_parser/test_parser/interface_web.idl

Issue 1001833005: Update from https://crrev.com/320343 (Closed) Base URL: git@github.com:domokit/mojo.git@master

Patch Set: Supress Created 5 years, 9 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: tools/idl_parser/test_parser/interface_web.idl

diff --git a/tools/idl_parser/test_parser/interface_web.idl b/tools/idl_parser/test_parser/interface_web.idl

index 9e69e9f12430849046edeff478539c035073f028..b1f3278623f8e4e764f5070dc8f495ff73fc1da9 100644

--- a/tools/idl_parser/test_parser/interface_web.idl

+++ b/tools/idl_parser/test_parser/interface_web.idl

@@ -72,6 +72,23 @@ interface MyIFaceMissingAttribute {

};

/* TREE

+ *Interface(MyIFaceContainsUnresolvedConflictDiff)

+ * Operation(foo)

+ * Arguments()

+ * Type()

+ * PrimitiveType(DOMString)

+ * Error(Unexpected "<" after ";".)

+ */

+interface MyIFaceContainsUnresolvedConflictDiff {

+ DOMString foo();

+<<<<<< ours

+ DOMString bar();

+ iterable<long>;

+======

+>>>>>> theirs

+};

+/* TREE

*Interface(MyIFaceBig)

* Const(setString)

* PrimitiveType(DOMString)

« no previous file with comments | « tools/idl_parser/idl_parser.py ('k') | tools/valgrind/asan/asan_symbolize.py » ('j') | no next file with comments »