Page MenuHomePhabricator
Files F15454607

D18631.diff
No OneTemporary
Actions

D18631.diff
View Options

diff --git a/src/lint/linter/ArcanistTextLinter.php b/src/lint/linter/ArcanistTextLinter.php
--- a/src/lint/linter/ArcanistTextLinter.php
+++ b/src/lint/linter/ArcanistTextLinter.php
@@ -311,9 +311,7 @@
$this->raiseLintAtOffset(
$offset,
self::LINT_EOF_WHITESPACE,
- pht(
- 'This file contains trailing whitespace at the end of the file. '.
- 'This is unnecessary and should be avoided when possible.'),
+ pht('This file contains unnecessary trailing whitespace.'),
$string,
'');
}
diff --git a/src/lint/renderer/ArcanistConsoleLintRenderer.php b/src/lint/renderer/ArcanistConsoleLintRenderer.php
--- a/src/lint/renderer/ArcanistConsoleLintRenderer.php
+++ b/src/lint/renderer/ArcanistConsoleLintRenderer.php
@@ -118,7 +118,6 @@
// or removing entire lines, but we'll adjust things below.
$new_impact = substr_count($replacement, "\n") + 1;
-
// If this is a change on a single line, we'll try to highlight the
// changed character range to make it easier to pick out.
if ($old_impact === 1 && $new_impact === 1) {
@@ -135,11 +134,13 @@
strlen($replacement));
}
-
// If lines at the beginning of the changed line range are actually the
// same, shrink the range. This happens when a patch just adds a line.
do {
- if ($old_lines[$start - 1] != $new_lines[$start - 1]) {
+ $old_line = idx($old_lines, $start - 1, null);
+ $new_line = idx($new_lines, $start - 1, null);
+
+ if ($old_line !== $new_line) {
break;
}
@@ -161,10 +162,10 @@
// same, shrink the range. This happens when a patch just removes a
// line.
do {
- $old_suffix = $old_lines[$start + $old_impact - 2];
- $new_suffix = $new_lines[$start + $new_impact - 2];
+ $old_suffix = idx($old_lines, $start + $old_impact - 2, null);
+ $new_suffix = idx($new_lines, $start + $new_impact - 2, null);
- if ($old_suffix != $new_suffix) {
+ if ($old_suffix !== $new_suffix) {
break;
}
diff --git a/src/lint/renderer/__tests__/ArcanistConsoleLintRendererTestCase.php b/src/lint/renderer/__tests__/ArcanistConsoleLintRendererTestCase.php
--- a/src/lint/renderer/__tests__/ArcanistConsoleLintRendererTestCase.php
+++ b/src/lint/renderer/__tests__/ArcanistConsoleLintRendererTestCase.php
@@ -113,6 +113,13 @@
'original' => $remline_original,
'replacement' => $remline_replacement,
),
+
+ 'extrawhitespace' => array(
+ 'line' => 2,
+ 'char' => 1,
+ 'original' => "\n",
+ 'replacement' => '',
+ ),
);
$defaults = array(
@@ -125,6 +132,8 @@
foreach ($map as $key => $test_case) {
$data = $this->readTestData("{$key}.txt");
+ $data = preg_replace('/~+\s*$/m', '', $data);
+
$expect = $this->readTestData("{$key}.expect");
$test_case = $test_case + $defaults;
diff --git a/src/lint/renderer/__tests__/data/extrawhitespace.expect b/src/lint/renderer/__tests__/data/extrawhitespace.expect
new file mode 100644
--- /dev/null
+++ b/src/lint/renderer/__tests__/data/extrawhitespace.expect
@@ -0,0 +1,8 @@
+>>> Lint for path/to/example.c:
+
+
+ Warning (WARN123) Lint Warning
+ Consider this.
+
+ 1 Adrift upon the sea.
+ >>> - 2 ~
diff --git a/src/lint/renderer/__tests__/data/extrawhitespace.txt b/src/lint/renderer/__tests__/data/extrawhitespace.txt
new file mode 100644
--- /dev/null
+++ b/src/lint/renderer/__tests__/data/extrawhitespace.txt
@@ -0,0 +1,3 @@
+Adrift upon the sea.
+
+~

File Metadata

Mime Type
text/plain
Expires
Sun, Mar 30, 7:19 PM (4 d, 49 m ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
7437716
Default Alt Text
D18631.diff (3 KB)

Event Timeline

Phabricator · Built by Phacility