Skip to content

Commit 2a2b473

Browse files
joshuaspencejoshuaspence
committed
Fix text lint issues
Summary: Ref T5105. This is a proof-of-concept for D11458. Test Plan: `arc lint --everything` Reviewers: epriestley, #blessed_reviewers Reviewed By: epriestley, #blessed_reviewers Subscribers: Korvin, epriestley Maniphest Tasks: T5105 Differential Revision: https://secure.phabricator.com/D11642
1 parent 5a20dae commit 2a2b473

File tree

9 files changed

+302
-299
lines changed

9 files changed

+302
-299
lines changed

‎.arclint

Lines changed: 2 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
{
22
"exclude": [
33
"(^externals/)",
4-
"(^webroot/rsrc/externals/(?!javelin/))",
5-
"(/__tests__/data/)"
4+
"(^webroot/rsrc/externals/(?!javelin/))"
65
],
76
"linters": {
87
"chmod": {
@@ -69,21 +68,7 @@
6968
"type": "spelling"
7069
},
7170
"text": {
72-
"type": "text",
73-
"exclude": [
74-
"(^\\.arclint$)",
75-
"(^resources/sql/quickstart.sql$)"
76-
]
77-
},
78-
"text-without-length": {
79-
"type": "text",
80-
"severity": {
81-
"3": "disabled"
82-
},
83-
"include": [
84-
"(^\\.arclint$)",
85-
"(^resources/sql/quickstart.sql$)"
86-
]
71+
"type": "text"
8772
},
8873
"xhpast": {
8974
"type": "xhpast",

‎.editorconfig

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,31 @@
33
[*]
44
indent_style = space
55
indent_size = 2
6+
end_of_line = lf
67
charset = utf-8
78
trim_trailing_whitespace = true
89
insert_final_newline = true
10+
max_line_length = 80
11+
12+
[.arclint]
13+
max_line_length =
14+
15+
[resources/sql/**.sql]
16+
max_line_length =
17+
18+
[scripts/install/install_*.sh]
19+
max_line_length =
20+
21+
[src/applications/differential/parser/__tests__/data/*.diff]
22+
trim_trailing_whitespace = false
23+
24+
[src/applications/differential/parser/__tests__/messages/long-title.txt]
25+
max_line_length =
26+
27+
[src/applications/diffusion/ssh/__tests__/hgwiredata/*.txt]
28+
max_line_length =
929

1030
[externals/**]
11-
; Use editor default (possible autodetection).
1231
indent_style =
1332
indent_size =
1433
trim_trailing_whitespace = false

‎LICENSE

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
21
Apache License
32
Version 2.0, January 2004
43
http://www.apache.org/licenses/

‎src/applications/diffusion/data/__tests__/DiffusionGitBranchTestCase.php

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -12,28 +12,28 @@ public function testRemoteBranchParser() {
1212
origin/master 713f1fc54f9cfc830acbf6bbdb46a2883f772896 Automat...
1313
alternate/stuff 4444444444444444444444444444444444444444 Hmm...
1414
origin/HEAD 713f1fc54f9cfc830acbf6bbdb46a2883f772896
15-
origin/weekend-refactoring 6e947ab0498b82075ca6195ac168385a11326c4b
15+
origin/refactoring 6e947ab0498b82075ca6195ac168385a11326c4b
1616
alternate/release-1.0.0 9ddd5d67962dd89fa167f9989954468b6c517b87
1717
1818
EOTXT;
1919

2020
$this->assertEqual(
2121
array(
22-
'origin/accent-folding' => 'bfaea2e72197506e028c604cd1a294b6e37aa17d',
23-
'origin/eventordering' => '185a90a3c1b0556015e5f318fb86ccf8f7a6f3e3',
24-
'origin/master' => '713f1fc54f9cfc830acbf6bbdb46a2883f772896',
25-
'alternate/stuff' => '4444444444444444444444444444444444444444',
26-
'origin/weekend-refactoring' => '6e947ab0498b82075ca6195ac168385a11326c4b',
27-
'alternate/release-1.0.0' => '9ddd5d67962dd89fa167f9989954468b6c517b87',
22+
'origin/accent-folding' => 'bfaea2e72197506e028c604cd1a294b6e37aa17d',
23+
'origin/eventordering' => '185a90a3c1b0556015e5f318fb86ccf8f7a6f3e3',
24+
'origin/master' => '713f1fc54f9cfc830acbf6bbdb46a2883f772896',
25+
'alternate/stuff' => '4444444444444444444444444444444444444444',
26+
'origin/refactoring' => '6e947ab0498b82075ca6195ac168385a11326c4b',
27+
'alternate/release-1.0.0' => '9ddd5d67962dd89fa167f9989954468b6c517b87',
2828
),
2929
DiffusionGitBranch::parseRemoteBranchOutput($output));
3030

3131
$this->assertEqual(
3232
array(
33-
'accent-folding' => 'bfaea2e72197506e028c604cd1a294b6e37aa17d',
34-
'eventordering' => '185a90a3c1b0556015e5f318fb86ccf8f7a6f3e3',
35-
'master' => '713f1fc54f9cfc830acbf6bbdb46a2883f772896',
36-
'weekend-refactoring' => '6e947ab0498b82075ca6195ac168385a11326c4b',
33+
'accent-folding' => 'bfaea2e72197506e028c604cd1a294b6e37aa17d',
34+
'eventordering' => '185a90a3c1b0556015e5f318fb86ccf8f7a6f3e3',
35+
'master' => '713f1fc54f9cfc830acbf6bbdb46a2883f772896',
36+
'refactoring' => '6e947ab0498b82075ca6195ac168385a11326c4b',
3737
),
3838
DiffusionGitBranch::parseRemoteBranchOutput($output, 'origin'));
3939
}

‎src/docs/book/contributor.book

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
{
2-
"name" : "phabcontrib",
3-
"title" : "Phabricator Contributor Documentation",
4-
"short" : "Phabricator Contributor Docs",
5-
"preface" : "Information for Phabricator contributors.",
6-
"root" : "../../../",
7-
"uri.source" :
2+
"name": "phabcontrib",
3+
"title": "Phabricator Contributor Documentation",
4+
"short": "Phabricator Contributor Docs",
5+
"preface": "Information for Phabricator contributors.",
6+
"root": "../../../",
7+
"uri.source":
88
"https://secure.phabricator.com/diffusion/P/browse/master/%f$%l",
9-
"rules" : {
10-
"(\\.diviner$)" : "DivinerArticleAtomizer"
9+
"rules": {
10+
"(\\.diviner$)": "DivinerArticleAtomizer"
1111
},
12-
"exclude" : [
12+
"exclude": [
1313
"(^externals/)",
1414
"(^webroot/rsrc/externals/)",
1515
"(^scripts/)",
@@ -19,18 +19,18 @@
1919
"(^src/docs/tech/)",
2020
"(^src/docs/flavor/)"
2121
],
22-
"groups" : {
23-
"contrib" : {
24-
"name" : "Contributor Overview"
22+
"groups": {
23+
"contrib": {
24+
"name": "Contributor Overview"
2525
},
2626
"detail": {
27-
"name" : "Contributing in Detail"
27+
"name": "Contributing in Detail"
2828
},
29-
"standards" : {
30-
"name" : "Coding Standards"
29+
"standards": {
30+
"name": "Coding Standards"
3131
},
32-
"developer" : {
33-
"name" : "Developer Guides"
32+
"developer": {
33+
"name": "Developer Guides"
3434
}
3535
}
3636
}

‎src/docs/book/flavor.book

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
{
2-
"name" : "phabflavor",
3-
"title" : "Phabricator Flavor Text",
4-
"short" : "Flavor Text",
5-
"preface" : "Recommendations, lore, and dark rituals.",
6-
"root" : "../../../",
7-
"uri.source" :
2+
"name": "phabflavor",
3+
"title": "Phabricator Flavor Text",
4+
"short": "Flavor Text",
5+
"preface": "Recommendations, lore, and dark rituals.",
6+
"root": "../../../",
7+
"uri.source":
88
"https://secure.phabricator.com/diffusion/P/browse/master/%f$%l",
9-
"rules" : {
10-
"(\\.diviner$)" : "DivinerArticleAtomizer"
9+
"rules": {
10+
"(\\.diviner$)": "DivinerArticleAtomizer"
1111
},
12-
"exclude" : [
12+
"exclude": [
1313
"(^externals/)",
1414
"(^webroot/rsrc/externals/)",
1515
"(^scripts/)",
@@ -19,24 +19,24 @@
1919
"(^src/docs/tech/)",
2020
"(^src/docs/contributor/)"
2121
],
22-
"groups" : {
23-
"overview" : {
24-
"name" : "Overview"
22+
"groups": {
23+
"overview": {
24+
"name": "Overview"
2525
},
26-
"review" : {
27-
"name" : "Revision Control and Code Review"
26+
"review": {
27+
"name": "Revision Control and Code Review"
2828
},
29-
"sundry" : {
30-
"name" : "Sundries"
29+
"sundry": {
30+
"name": "Sundries"
3131
},
32-
"lore" : {
33-
"name" : "Phabricator Lore"
32+
"lore": {
33+
"name": "Phabricator Lore"
3434
},
35-
"php" : {
36-
"name" : "PHP"
35+
"php": {
36+
"name": "PHP"
3737
},
38-
"javascript" : {
39-
"name" : "Javascript"
38+
"javascript": {
39+
"name": "Javascript"
4040
}
4141
}
4242
}

0 commit comments

Comments
 (0)