Skip to content

Commit 9f23619

Browse files
zonuexezonuexe
authored
Merge pull request #596 from emacs-php/fix/face-tests
Fix face tests
2 parents b4a0034 + aaf3b7e commit 9f23619

13 files changed

+193
-95
lines changed

‎tests/7.4/arrow-function.php.faces‎

Lines changed: 36 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -11,54 +11,78 @@
1111
("\n\n")
1212
("$" . php-variable-sigil)
1313
("fn1" . php-variable-name)
14-
(" = ")
14+
(" ")
15+
("=" . php-assignment-op)
16+
(" ")
1517
("fn" . php-keyword)
1618
("(")
1719
("$" . php-variable-sigil)
1820
("x" . php-variable-name)
19-
(") => ")
21+
(") =")
22+
(">" . php-comparison-op)
23+
(" ")
2024
("$" . php-variable-sigil)
2125
("x" . php-variable-name)
22-
(" + ")
26+
(" ")
27+
("+" . php-arithmetic-op)
28+
(" ")
2329
("$" . php-variable-sigil)
2430
("y" . php-variable-name)
2531
(";\n\n")
2632
("$" . php-variable-sigil)
2733
("fn2" . php-variable-name)
28-
(" = [\n ")
34+
(" ")
35+
("=" . php-assignment-op)
36+
(" [\n ")
2937
("fn" . php-keyword)
3038
("(")
3139
("$" . php-variable-sigil)
3240
("x" . php-variable-name)
33-
(") => ")
41+
(") =")
42+
(">" . php-comparison-op)
43+
(" ")
3444
("$" . php-variable-sigil)
3545
("x" . php-variable-name)
36-
(" + ")
46+
(" ")
47+
("+" . php-arithmetic-op)
48+
(" ")
3749
("$" . php-variable-sigil)
3850
("y" . php-variable-name)
3951
("\n];\n\n")
4052
("$" . php-variable-sigil)
4153
("z" . php-variable-name)
42-
(" = 1;\n")
54+
(" ")
55+
("=" . php-assignment-op)
56+
(" 1;\n")
4357
("$" . php-variable-sigil)
4458
("fn3" . php-variable-name)
45-
(" = ")
59+
(" ")
60+
("=" . php-assignment-op)
61+
(" ")
4662
("fn" . php-keyword)
4763
("(")
4864
("$" . php-variable-sigil)
4965
("x" . php-variable-name)
50-
(") => ")
66+
(") =")
67+
(">" . php-comparison-op)
68+
(" ")
5169
("fn" . php-keyword)
5270
("(")
5371
("$" . php-variable-sigil)
5472
("y" . php-variable-name)
55-
(") => ")
73+
(") =")
74+
(">" . php-comparison-op)
75+
(" ")
5676
("$" . php-variable-sigil)
5777
("x" . php-variable-name)
58-
(" * ")
78+
(" ")
79+
("*" . php-arithmetic-op)
80+
(" ")
5981
("$" . php-variable-sigil)
6082
("y" . php-variable-name)
61-
(" + ")
83+
(" ")
84+
("+" . php-arithmetic-op)
85+
(" ")
6286
("$" . php-variable-sigil)
6387
("z" . php-variable-name)
6488
(";\n"))

‎tests/7.4/typed-property.php.faces‎

Lines changed: 15 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,24 @@
11
;; -*- mode: emacs-lisp -*-
22
(("<?php" . php-php-tag)
3-
("
4-
5-
")
3+
("\n\n")
64
("class" . php-keyword)
75
(" ")
86
("Typed" . font-lock-type-face)
9-
("
10-
{
11-
")
7+
("\n{\n ")
128
("private" . php-keyword)
139
(" ")
1410
("?string" . php-class)
1511
(" ")
1612
("$" . php-variable-sigil)
1713
("string" . php-variable-name)
18-
(";
19-
20-
")
14+
(";\n\n ")
2115
("private" . php-keyword)
2216
(" ")
2317
("Hoge" . php-class)
2418
(" ")
2519
("$" . php-variable-sigil)
2620
("hoge" . php-variable-name)
27-
(";
28-
29-
")
21+
(";\n\n ")
3022
("public" . php-keyword)
3123
(" ")
3224
("function" . php-keyword)
@@ -35,46 +27,38 @@
3527
("(")
3628
("$" . php-variable-sigil)
3729
("var" . php-variable-name)
38-
(" = ")
30+
(" ")
31+
("=" . php-assignment-op)
32+
(" ")
3933
("null" . php-constant)
40-
(")
41-
{
42-
")
34+
(")\n {\n ")
4335
("$" . php-$this-sigil)
4436
("this" . php-$this)
4537
("->" . php-object-op)
4638
("string" . php-property-name)
47-
(" = ")
39+
(" ")
40+
("=" . php-assignment-op)
41+
(" ")
4842
("$" . php-variable-sigil)
4943
("var" . php-variable-name)
50-
(";
51-
}
52-
53-
")
44+
(";\n }\n\n ")
5445
("public" . php-keyword)
5546
(" ")
5647
("function" . php-keyword)
5748
(" ")
5849
("print" . php-function-name)
59-
("()
60-
{
61-
")
50+
("()\n {\n ")
6251
("var_dump" . php-function-call)
6352
("(")
6453
("$" . php-$this-sigil)
6554
("this" . php-$this)
6655
("->" . php-object-op)
6756
("string" . php-property-name)
68-
(");
69-
}
70-
}
71-
72-
(")
57+
(");\n }\n}\n\n(")
7358
("new" . php-keyword)
7459
(" ")
7560
("Typed" . font-lock-type-face)
7661
(")")
7762
("->" . php-object-op)
7863
("print" . php-method-call)
79-
("();
80-
"))
64+
("();\n"))

‎tests/arrays.php.faces‎

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,23 @@
55
("Array should be treated like a normal keyword\n" . font-lock-comment-face)
66
("$" . php-variable-sigil)
77
("test" . php-variable-name)
8-
(" = ")
8+
(" ")
9+
("=" . php-assignment-op)
10+
(" ")
911
("array" . php-keyword)
1012
("();\n\n")
1113
("$" . php-variable-sigil)
1214
("test" . php-variable-name)
13-
(" = ")
15+
(" ")
16+
("=" . php-assignment-op)
17+
(" ")
1418
("function" . php-keyword)
1519
("(")
1620
("$" . php-variable-sigil)
1721
("test" . php-variable-name)
18-
(" = ")
22+
(" ")
23+
("=" . php-assignment-op)
24+
(" ")
1925
("array" . php-keyword)
2026
("()) {\n};\n\n")
2127
("// " . font-lock-comment-delimiter-face)
@@ -28,15 +34,19 @@
2834
("- return type, should look like `: int`\n" . font-lock-comment-face)
2935
("$" . php-variable-sigil)
3036
("test" . php-variable-name)
31-
(" = (")
37+
(" ")
38+
("=" . php-assignment-op)
39+
(" (")
3240
("array" . font-lock-type-face)
3341
(")")
3442
("$" . php-variable-sigil)
3543
("test" . php-variable-name)
3644
(";\n\n")
3745
("$" . php-variable-sigil)
3846
("test" . php-variable-name)
39-
(" = ")
47+
(" ")
48+
("=" . php-assignment-op)
49+
(" ")
4050
("function" . php-keyword)
4151
("(")
4252
("array" . font-lock-type-face)

‎tests/comments.php.24.faces‎

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,9 @@
7373
("const" . php-keyword)
7474
(" ")
7575
("SAMPLE" . php-constant-assign)
76-
(" = ")
76+
(" ")
77+
("=" . php-assignment-op)
78+
(" ")
7779
("'SAMPLE'" . php-string)
7880
(";\n ")
7981
("/** " . font-lock-doc-face)
@@ -109,7 +111,9 @@
109111
("this" . php-$this)
110112
("->" . php-object-op)
111113
("name" . php-property-name)
112-
(" = ")
114+
(" ")
115+
("=" . php-assignment-op)
116+
(" ")
113117
("$" . php-variable-sigil)
114118
("name" . php-variable-name)
115119
("; ")
@@ -129,7 +133,9 @@
129133
("\n ")
130134
("$" . php-variable-sigil)
131135
("foo" . php-variable-name)
132-
(" = ")
136+
(" ")
137+
("=" . php-assignment-op)
138+
(" ")
133139
("hoge" . php-function-call)
134140
("();\n\n ")
135141
("// " . font-lock-comment-delimiter-face)
@@ -146,7 +152,9 @@
146152
("\n ")
147153
("$" . php-variable-sigil)
148154
("offset" . php-variable-name)
149-
(" = 0;\n }\n\n ")
155+
(" ")
156+
("=" . php-assignment-op)
157+
(" 0;\n }\n\n ")
150158
("/**\n * Summary\n *\n * " . font-lock-doc-face)
151159
("@throws" php-doc-annotation-tag font-lock-doc-face)
152160
(" " . font-lock-doc-face)

‎tests/comments.php.27.faces‎

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,9 @@
7474
("const" . php-keyword)
7575
(" ")
7676
("SAMPLE" . font-lock-type-face)
77-
(" = ")
77+
(" ")
78+
("=" . php-assignment-op)
79+
(" ")
7880
("'SAMPLE'" . php-string)
7981
(";\n ")
8082
("/** " . font-lock-doc-face)
@@ -110,7 +112,9 @@
110112
("this" . php-$this)
111113
("->" . php-object-op)
112114
("name" . php-property-name)
113-
(" = ")
115+
(" ")
116+
("=" . php-assignment-op)
117+
(" ")
114118
("$" . php-variable-sigil)
115119
("name" . php-variable-name)
116120
("; ")
@@ -130,7 +134,9 @@
130134
("\n ")
131135
("$" . php-variable-sigil)
132136
("foo" . php-variable-name)
133-
(" = ")
137+
(" ")
138+
("=" . php-assignment-op)
139+
(" ")
134140
("hoge" . php-function-call)
135141
("();\n\n ")
136142
("// " . font-lock-comment-delimiter-face)
@@ -147,7 +153,9 @@
147153
("\n ")
148154
("$" . php-variable-sigil)
149155
("offset" . php-variable-name)
150-
(" = 0;\n }\n\n ")
156+
(" ")
157+
("=" . php-assignment-op)
158+
(" 0;\n }\n\n ")
151159
("/**\n * Summary\n *\n * " . font-lock-doc-face)
152160
("@throws" php-doc-annotation-tag font-lock-doc-face)
153161
(" " . font-lock-doc-face)

‎tests/comments.php.faces‎

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,9 @@
7373
("const" . php-keyword)
7474
(" ")
7575
("SAMPLE" . font-lock-type-face)
76-
(" = ")
76+
(" ")
77+
("=" . php-assignment-op)
78+
(" ")
7779
("'SAMPLE'" . php-string)
7880
(";\n ")
7981
("/** " . font-lock-doc-face)
@@ -109,7 +111,9 @@
109111
("this" . php-$this)
110112
("->" . php-object-op)
111113
("name" . php-property-name)
112-
(" = ")
114+
(" ")
115+
("=" . php-assignment-op)
116+
(" ")
113117
("$" . php-variable-sigil)
114118
("name" . php-variable-name)
115119
("; ")
@@ -129,7 +133,9 @@
129133
("\n ")
130134
("$" . php-variable-sigil)
131135
("foo" . php-variable-name)
132-
(" = ")
136+
(" ")
137+
("=" . php-assignment-op)
138+
(" ")
133139
("hoge" . php-function-call)
134140
("();\n\n ")
135141
("// " . font-lock-comment-delimiter-face)
@@ -146,7 +152,9 @@
146152
("\n ")
147153
("$" . php-variable-sigil)
148154
("offset" . php-variable-name)
149-
(" = 0;\n }\n\n ")
155+
(" ")
156+
("=" . php-assignment-op)
157+
(" 0;\n }\n\n ")
150158
("/**\n * Summary\n *\n * " . font-lock-doc-face)
151159
("@throws" php-doc-annotation-tag font-lock-doc-face)
152160
(" " . font-lock-doc-face)

‎tests/constants.php.faces‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,21 @@
44
("// " . font-lock-comment-delimiter-face)
55
("Test c-lang-defconst c-constant-kwds\n" . font-lock-comment-face)
66
("true" . php-constant)
7-
(" === ")
7+
(" ")
8+
("===" . php-comparison-op)
9+
(" ")
810
("TRUE" . php-constant)
911
(";\n")
1012
("false" . php-constant)
11-
(" === ")
13+
(" ")
14+
("===" . php-comparison-op)
15+
(" ")
1216
("FALSE" . php-constant)
1317
(";\n")
1418
("null" . php-constant)
15-
(" === ")
19+
(" ")
20+
("===" . php-comparison-op)
21+
(" ")
1622
("NULL" . php-constant)
1723
(";\n\n")
1824
("// " . font-lock-comment-delimiter-face)

0 commit comments

Comments
 (0)