diff --git a/.arclint b/.arclint index 89da0c0dd..ca8cf1fb8 100644 --- a/.arclint +++ b/.arclint @@ -1,82 +1,82 @@ { "exclude": [ "(^externals/)", - "(\\.lint-test$)" + "(/__tests__/data/)" ], "linters": { "chmod": { "type": "chmod" }, "filename": { "type": "filename" }, "javelin": { "type": "javelin", "include": "(\\.js$)", "exclude": [ "(^externals/JsShrink/)", "(^support/aphlict/)", "(^webroot/rsrc/externals/raphael/)" ] }, "jshint": { "type": "jshint", "include": "(\\.js$)", "exclude": [ "(^externals/JsShrink/)", "(^webroot/rsrc/externals/raphael/)" ], "flags": ["--config=support/jshint/jshintconfig"] }, "generated": { "type": "generated" }, "merge-conflict": { "type": "merge-conflict" }, "nolint": { "type": "nolint" }, "phutil-xhpast": { "type": "phutil-xhpast", "include": "(\\.php$)", "phutil-xhpast.deprecated.functions": { "phutil_escape_html": "The phutil_escape_html() function is deprecated. Raw strings passed to phutil_tag() or hsprintf() are escaped automatically." } }, "phutil-library": { "type": "phutil-library", "include": "(\\.php$)" }, "text": { "type": "text", "exclude": [ "(^\\.arclint)" ] }, "text-without-length": { "type": "text", "severity": { "3": "disabled" }, "include": [ "(^\\.arclint)" ] }, "spelling": { "type": "spelling" }, "xhpast": { "type": "xhpast", "include": "(\\.php$)", "severity": { "16": "advice", "29": "warning", "31": "error", "34": "error", "35": "error" }, "xhpast.naminghook": "PhabricatorSymbolNameLinter" } } } diff --git a/src/applications/differential/parser/__tests__/data/missing_context.diff b/src/applications/differential/parser/__tests__/data/missing_context.diff index 357a78529..e5f2e19ad 100644 --- a/src/applications/differential/parser/__tests__/data/missing_context.diff +++ b/src/applications/differential/parser/__tests__/data/missing_context.diff @@ -1,10 +1,11 @@ diff --git a/fruit b/fruit index a1f7255..b5fb7b8 100644 --- a/fruit +++ b/fruit @@ -4,6 +4,5 @@ cherry date elderberry fig -grape honeydew + diff --git a/src/applications/differential/parser/__tests__/data/missing_context_2.diff b/src/applications/differential/parser/__tests__/data/missing_context_2.diff index 514236ded..4e683981a 100644 --- a/src/applications/differential/parser/__tests__/data/missing_context_2.diff +++ b/src/applications/differential/parser/__tests__/data/missing_context_2.diff @@ -1,11 +1,12 @@ diff --git a/fruit b/fruit index a1f7255..fa84742 100644 --- a/fruit +++ b/fruit @@ -5,5 +5,7 @@ date elderberry fig grape +guava +gooseberry honeydew + diff --git a/src/applications/differential/parser/__tests__/data/missing_context_3.diff b/src/applications/differential/parser/__tests__/data/missing_context_3.diff index 28f93725a..d8802ab89 100644 --- a/src/applications/differential/parser/__tests__/data/missing_context_3.diff +++ b/src/applications/differential/parser/__tests__/data/missing_context_3.diff @@ -1,17 +1,18 @@ diff --git a/fruit b/fruit index bf66874..071dd49 100644 --- a/fruit +++ b/fruit @@ -4,7 +4,6 @@ date elderberry fig banana -grape honeydew apple cherry @@ -13,5 +12,4 @@ elderberry fig banana grape -honeydew +