Skip to content

Commit

Permalink
Fix text lint issues
Browse files Browse the repository at this point in the history
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
  • Loading branch information
joshuaspence committed Feb 11, 2015
1 parent 5a20dae commit 2a2b473
Show file tree
Hide file tree
Showing 9 changed files with 302 additions and 299 deletions.
19 changes: 2 additions & 17 deletions .arclint
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
{
"exclude": [
"(^externals/)",
"(^webroot/rsrc/externals/(?!javelin/))",
"(/__tests__/data/)"
"(^webroot/rsrc/externals/(?!javelin/))"
],
"linters": {
"chmod": {
Expand Down Expand Up @@ -69,21 +68,7 @@
"type": "spelling"
},
"text": {
"type": "text",
"exclude": [
"(^\\.arclint$)",
"(^resources/sql/quickstart.sql$)"
]
},
"text-without-length": {
"type": "text",
"severity": {
"3": "disabled"
},
"include": [
"(^\\.arclint$)",
"(^resources/sql/quickstart.sql$)"
]
"type": "text"
},
"xhpast": {
"type": "xhpast",
Expand Down
21 changes: 20 additions & 1 deletion .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,31 @@
[*]
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

[.arclint]
max_line_length =

[resources/sql/**.sql]
max_line_length =

[scripts/install/install_*.sh]
max_line_length =

[src/applications/differential/parser/__tests__/data/*.diff]
trim_trailing_whitespace = false

[src/applications/differential/parser/__tests__/messages/long-title.txt]
max_line_length =

[src/applications/diffusion/ssh/__tests__/hgwiredata/*.txt]
max_line_length =

[externals/**]
; Use editor default (possible autodetection).
indent_style =
indent_size =
trim_trailing_whitespace = false
Expand Down
1 change: 0 additions & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

Apache License
Version 2.0, January 2004
http://www.apache.org/licenses/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,28 +12,28 @@ public function testRemoteBranchParser() {
origin/master 713f1fc54f9cfc830acbf6bbdb46a2883f772896 Automat...
alternate/stuff 4444444444444444444444444444444444444444 Hmm...
origin/HEAD 713f1fc54f9cfc830acbf6bbdb46a2883f772896
origin/weekend-refactoring 6e947ab0498b82075ca6195ac168385a11326c4b
origin/refactoring 6e947ab0498b82075ca6195ac168385a11326c4b
alternate/release-1.0.0 9ddd5d67962dd89fa167f9989954468b6c517b87
EOTXT;

$this->assertEqual(
array(
'origin/accent-folding' => 'bfaea2e72197506e028c604cd1a294b6e37aa17d',
'origin/eventordering' => '185a90a3c1b0556015e5f318fb86ccf8f7a6f3e3',
'origin/master' => '713f1fc54f9cfc830acbf6bbdb46a2883f772896',
'alternate/stuff' => '4444444444444444444444444444444444444444',
'origin/weekend-refactoring' => '6e947ab0498b82075ca6195ac168385a11326c4b',
'alternate/release-1.0.0' => '9ddd5d67962dd89fa167f9989954468b6c517b87',
'origin/accent-folding' => 'bfaea2e72197506e028c604cd1a294b6e37aa17d',
'origin/eventordering' => '185a90a3c1b0556015e5f318fb86ccf8f7a6f3e3',
'origin/master' => '713f1fc54f9cfc830acbf6bbdb46a2883f772896',
'alternate/stuff' => '4444444444444444444444444444444444444444',
'origin/refactoring' => '6e947ab0498b82075ca6195ac168385a11326c4b',
'alternate/release-1.0.0' => '9ddd5d67962dd89fa167f9989954468b6c517b87',
),
DiffusionGitBranch::parseRemoteBranchOutput($output));

$this->assertEqual(
array(
'accent-folding' => 'bfaea2e72197506e028c604cd1a294b6e37aa17d',
'eventordering' => '185a90a3c1b0556015e5f318fb86ccf8f7a6f3e3',
'master' => '713f1fc54f9cfc830acbf6bbdb46a2883f772896',
'weekend-refactoring' => '6e947ab0498b82075ca6195ac168385a11326c4b',
'accent-folding' => 'bfaea2e72197506e028c604cd1a294b6e37aa17d',
'eventordering' => '185a90a3c1b0556015e5f318fb86ccf8f7a6f3e3',
'master' => '713f1fc54f9cfc830acbf6bbdb46a2883f772896',
'refactoring' => '6e947ab0498b82075ca6195ac168385a11326c4b',
),
DiffusionGitBranch::parseRemoteBranchOutput($output, 'origin'));
}
Expand Down
34 changes: 17 additions & 17 deletions src/docs/book/contributor.book
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
{
"name" : "phabcontrib",
"title" : "Phabricator Contributor Documentation",
"short" : "Phabricator Contributor Docs",
"preface" : "Information for Phabricator contributors.",
"root" : "../../../",
"uri.source" :
"name": "phabcontrib",
"title": "Phabricator Contributor Documentation",
"short": "Phabricator Contributor Docs",
"preface": "Information for Phabricator contributors.",
"root": "../../../",
"uri.source":
"https://secure.phabricator.com/diffusion/P/browse/master/%f$%l",
"rules" : {
"(\\.diviner$)" : "DivinerArticleAtomizer"
"rules": {
"(\\.diviner$)": "DivinerArticleAtomizer"
},
"exclude" : [
"exclude": [
"(^externals/)",
"(^webroot/rsrc/externals/)",
"(^scripts/)",
Expand All @@ -19,18 +19,18 @@
"(^src/docs/tech/)",
"(^src/docs/flavor/)"
],
"groups" : {
"contrib" : {
"name" : "Contributor Overview"
"groups": {
"contrib": {
"name": "Contributor Overview"
},
"detail": {
"name" : "Contributing in Detail"
"name": "Contributing in Detail"
},
"standards" : {
"name" : "Coding Standards"
"standards": {
"name": "Coding Standards"
},
"developer" : {
"name" : "Developer Guides"
"developer": {
"name": "Developer Guides"
}
}
}
44 changes: 22 additions & 22 deletions src/docs/book/flavor.book
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
{
"name" : "phabflavor",
"title" : "Phabricator Flavor Text",
"short" : "Flavor Text",
"preface" : "Recommendations, lore, and dark rituals.",
"root" : "../../../",
"uri.source" :
"name": "phabflavor",
"title": "Phabricator Flavor Text",
"short": "Flavor Text",
"preface": "Recommendations, lore, and dark rituals.",
"root": "../../../",
"uri.source":
"https://secure.phabricator.com/diffusion/P/browse/master/%f$%l",
"rules" : {
"(\\.diviner$)" : "DivinerArticleAtomizer"
"rules": {
"(\\.diviner$)": "DivinerArticleAtomizer"
},
"exclude" : [
"exclude": [
"(^externals/)",
"(^webroot/rsrc/externals/)",
"(^scripts/)",
Expand All @@ -19,24 +19,24 @@
"(^src/docs/tech/)",
"(^src/docs/contributor/)"
],
"groups" : {
"overview" : {
"name" : "Overview"
"groups": {
"overview": {
"name": "Overview"
},
"review" : {
"name" : "Revision Control and Code Review"
"review": {
"name": "Revision Control and Code Review"
},
"sundry" : {
"name" : "Sundries"
"sundry": {
"name": "Sundries"
},
"lore" : {
"name" : "Phabricator Lore"
"lore": {
"name": "Phabricator Lore"
},
"php" : {
"name" : "PHP"
"php": {
"name": "PHP"
},
"javascript" : {
"name" : "Javascript"
"javascript": {
"name": "Javascript"
}
}
}
Loading

0 comments on commit 2a2b473

Please sign in to comment.