Page MenuHomePhabricator
Files F14407237

D11641.id28257.diff
No OneTemporary
Actions

D11641.id28257.diff
View Options

diff --git a/.arclint b/.arclint
--- a/.arclint
+++ b/.arclint
@@ -1,74 +1,13 @@
{
"exclude": [
- "(^externals/)",
- "(^src/console/__tests__/wrap/.*\\.txt(\\.expect)?$)",
- "(^src/markup/engine/__tests__/remarkup/.*\\.txt$)",
- "(^src/markup/syntax/highlighter/__tests__/xhpast/.*\\.(expect|source)$)"
+ "(^externals/)"
],
"linters": {
- "chmod": {
- "type": "chmod"
- },
- "filename": {
- "type": "filename"
- },
"generated": {
"type": "generated"
},
- "json": {
- "type": "json",
- "include": [
- "(^\\.arcconfig$)",
- "(^\\.arclint$)",
- "(\\.json$)"
- ]
- },
- "merge-conflict": {
- "type": "merge-conflict"
- },
- "nolint": {
- "type": "nolint"
- },
- "phutil-library": {
- "type": "phutil-library",
- "include": "(\\.php$)"
- },
- "phutil-xhpast": {
- "type": "phutil-xhpast",
- "include": "(\\.php$)"
- },
- "spelling": {
- "type": "spelling"
- },
"text": {
- "type": "text",
- "exclude": [
- "(^support/xhpast/\\w+\\.(hpp|l|y)$)",
- "(^\\.arclint$)"
- ]
- },
- "text-without-length": {
- "type": "text",
- "severity": {
- "3": "disabled"
- },
- "include": [
- "(^support/xhpast/\\w+\\.(hpp|l|y)$)",
- "(^\\.arclint$)"
- ]
- },
- "xhpast": {
- "type": "xhpast",
- "include": "(\\.php$)",
- "severity": {
- "16": "advice",
- "34": "error"
- },
- "xhpast.blacklisted.function": {
- "eval": "The eval() function should be avoided. It is potentially unsafe and makes debugging more difficult."
- },
- "xhpast.php-version": "5.2.3",
- "xhpast.php-version.windows": "5.3.0"
+ "type": "text"
}
}
}
diff --git a/.editorconfig b/.editorconfig
--- a/.editorconfig
+++ b/.editorconfig
@@ -3,26 +3,52 @@
[*]
indent_style = space
indent_size = 2
+end_of_line = lf
charset = utf-8
trim_trailing_whitespace = true
insert_final_newline = true
+max_line_length = 80
+
+[Makefile]
+indent_style = tab
+
+[.arclint]
+max_line_length =
+
+[externals/**]
+indent_style =
+indent_size =
+trim_trailing_whitespace = false
+insert_final_newline = false
+
+[resources/ssl/*.pem]
+max_line_length =
+
+[src/console/__tests__/wrap/*.txt{,.expect}]
+trim_trailing_whitespace = false
+max_line_length =
[src/markup/engine/__tests__/remarkup/*.txt]
trim_trailing_whitespace = false
+max_line_length =
+
+[src/markup/syntax/highlighter/__tests__/phpfragment/*.expect]
+max_line_length =
+
+[src/markup/syntax/highlighter/__tests__/xhpast/*.expect]
+max_line_length =
+
+[src/markup/syntax/highlighter/__tests__/xhpast/*.{expect,source}]
insert_final_newline = false
[src/parser/__tests__/json/*.data]
insert_final_newline = false
+[src/parser/__tests__/json/*.{data,json}]
+max_line_length =
+
[src/parser/__tests__/languageguesser/*]
indent_style =
-[Makefile]
-indent_style = tab
-
-[externals/**]
-; Use editor default (possible autodetection).
-indent_style =
-indent_size =
-trim_trailing_whitespace = false
-insert_final_newline = false
+[support/xhpast/*.{cpp,hpp,l,y}]
+max_line_length =
diff --git a/LICENSE b/LICENSE
--- a/LICENSE
+++ b/LICENSE
@@ -1,4 +1,3 @@
-
Apache License
Version 2.0, January 2004
http://www.apache.org/licenses/
diff --git a/src/console/__tests__/wrap/long.txt b/src/console/__tests__/wrap/long.txt
--- a/src/console/__tests__/wrap/long.txt
+++ b/src/console/__tests__/wrap/long.txt
@@ -1 +1 @@
-Say MMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMM every day.
\ No newline at end of file
+Say MMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMM every day.
diff --git a/src/console/__tests__/wrap/long.txt.expect b/src/console/__tests__/wrap/long.txt.expect
--- a/src/console/__tests__/wrap/long.txt.expect
+++ b/src/console/__tests__/wrap/long.txt.expect
@@ -1,3 +1,3 @@
Say
MMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMM
-every day.
\ No newline at end of file
+every day.
diff --git a/src/console/__tests__/wrap/plain.txt b/src/console/__tests__/wrap/plain.txt
--- a/src/console/__tests__/wrap/plain.txt
+++ b/src/console/__tests__/wrap/plain.txt
@@ -1 +1 @@
-Morbi auctor commodo libero, vel interdum leo commodo nec. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Vestibulum dictum pretium lorem ac commodo. Vivamus ullamcorper neque et velit interdum ornare. Fusce adipiscing metus non sem porttitor scelerisque. Aliquam mattis sem non tortor semper eget fermentum libero faucibus. Nam vulputate mauris at nunc bibendum mollis. Aliquam mattis rutrum turpis a fringilla. Mauris quis nulla eget nunc mollis pharetra id sit amet arcu. Nam ut urna in ligula facilisis scelerisque in nec massa. Morbi posuere, turpis in bibendum fringilla, augue felis gravida est, vitae convallis quam nunc at tellus.
\ No newline at end of file
+Morbi auctor commodo libero, vel interdum leo commodo nec. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Vestibulum dictum pretium lorem ac commodo. Vivamus ullamcorper neque et velit interdum ornare. Fusce adipiscing metus non sem porttitor scelerisque. Aliquam mattis sem non tortor semper eget fermentum libero faucibus. Nam vulputate mauris at nunc bibendum mollis. Aliquam mattis rutrum turpis a fringilla. Mauris quis nulla eget nunc mollis pharetra id sit amet arcu. Nam ut urna in ligula facilisis scelerisque in nec massa. Morbi posuere, turpis in bibendum fringilla, augue felis gravida est, vitae convallis quam nunc at tellus.
diff --git a/src/console/__tests__/wrap/plain.txt.expect b/src/console/__tests__/wrap/plain.txt.expect
--- a/src/console/__tests__/wrap/plain.txt.expect
+++ b/src/console/__tests__/wrap/plain.txt.expect
@@ -6,4 +6,4 @@
nunc bibendum mollis. Aliquam mattis rutrum turpis a fringilla. Mauris quis
nulla eget nunc mollis pharetra id sit amet arcu. Nam ut urna in ligula
facilisis scelerisque in nec massa. Morbi posuere, turpis in bibendum
-fringilla, augue felis gravida est, vitae convallis quam nunc at tellus.
\ No newline at end of file
+fringilla, augue felis gravida est, vitae convallis quam nunc at tellus.
diff --git a/src/console/__tests__/wrap/trailing-space-prompt.txt b/src/console/__tests__/wrap/trailing-space-prompt.txt
--- a/src/console/__tests__/wrap/trailing-space-prompt.txt
+++ b/src/console/__tests__/wrap/trailing-space-prompt.txt
@@ -1 +1 @@
-Do you want to do stuff? [y/N]
\ No newline at end of file
+Do you want to do stuff? [y/N]
diff --git a/src/console/__tests__/wrap/trailing-space-prompt.txt.expect b/src/console/__tests__/wrap/trailing-space-prompt.txt.expect
--- a/src/console/__tests__/wrap/trailing-space-prompt.txt.expect
+++ b/src/console/__tests__/wrap/trailing-space-prompt.txt.expect
@@ -1 +1 @@
-Do you want to do stuff? [y/N]
\ No newline at end of file
+Do you want to do stuff? [y/N]
diff --git a/src/console/__tests__/wrap/utf8.txt b/src/console/__tests__/wrap/utf8.txt
--- a/src/console/__tests__/wrap/utf8.txt
+++ b/src/console/__tests__/wrap/utf8.txt
@@ -1 +1 @@
-☃☃☃☃☃☃ ☃☃☃☃☃☃ ☃☃☃☃☃☃ ☃☃☃☃☃☃ ☃☃☃☃☃ ☃☃☃☃☃ ☃☃☃☃☃ ☃☃☃☃☃ ☃☃☃☃☃ ☃☃☃☃☃ ☃☃☃☃☃ ☃☃☃☃☃ ☃☃☃☃☃ ☃☃☃☃☃ ☃☃☃☃☃ ☃☃☃☃☃
\ No newline at end of file
+☃☃☃☃☃☃ ☃☃☃☃☃☃ ☃☃☃☃☃☃ ☃☃☃☃☃☃ ☃☃☃☃☃ ☃☃☃☃☃ ☃☃☃☃☃ ☃☃☃☃☃ ☃☃☃☃☃ ☃☃☃☃☃ ☃☃☃☃☃ ☃☃☃☃☃ ☃☃☃☃☃ ☃☃☃☃☃ ☃☃☃☃☃ ☃☃☃☃☃
diff --git a/src/console/__tests__/wrap/utf8.txt.expect b/src/console/__tests__/wrap/utf8.txt.expect
--- a/src/console/__tests__/wrap/utf8.txt.expect
+++ b/src/console/__tests__/wrap/utf8.txt.expect
@@ -1,2 +1,2 @@
☃☃☃☃☃☃ ☃☃☃☃☃☃ ☃☃☃☃☃☃ ☃☃☃☃☃☃ ☃☃☃☃☃ ☃☃☃☃☃ ☃☃☃☃☃ ☃☃☃☃☃ ☃☃☃☃☃ ☃☃☃☃☃ ☃☃☃☃☃ ☃☃☃☃☃
-☃☃☃☃☃ ☃☃☃☃☃ ☃☃☃☃☃ ☃☃☃☃☃
\ No newline at end of file
+☃☃☃☃☃ ☃☃☃☃☃ ☃☃☃☃☃ ☃☃☃☃☃

File Metadata

Mime Type
text/plain
Expires
Wed, Dec 25, 2:30 AM (7 h, 28 m)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
6924390
Default Alt Text
D11641.id28257.diff (9 KB)

Event Timeline

Phabricator · Built by Phacility