Page MenuHomePhabricator
Files F15457663

D18759.diff
No OneTemporary
Actions

D18759.diff
View Options

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
@@ -148,36 +148,35 @@
$old_impact--;
$new_impact--;
- if ($old_impact < 0 || $new_impact < 0) {
- throw new Exception(
- pht(
- 'Modified prefix line range has become negative '.
- '(old = %d, new = %d).',
- $old_impact,
- $new_impact));
+ // We can end up here if a patch removes a line which occurs before
+ // another identical line.
+ if ($old_impact <= 0 || $new_impact <= 0) {
+ break;
}
} while (true);
// If the lines at the end of the changed line range are actually the
// same, shrink the range. This happens when a patch just removes a
// line.
- do {
- $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) {
- break;
- }
-
- $old_impact--;
- $new_impact--;
-
- // We can end up here if a patch removes a line which occurs after
- // another identical line.
- if ($old_impact <= 0 || $new_impact <= 0) {
- break;
- }
- } while (true);
+ if ($old_impact > 0 && $new_impact > 0) {
+ do {
+ $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) {
+ break;
+ }
+
+ $old_impact--;
+ $new_impact--;
+
+ // We can end up here if a patch removes a line which occurs after
+ // another identical line.
+ if ($old_impact <= 0 || $new_impact <= 0) {
+ break;
+ }
+ } while (true);
+ }
} else {
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
@@ -142,6 +142,20 @@
'replacement' => "\nX\nY\n",
),
+ 'rmmulti' => array(
+ 'line' => 2,
+ 'char' => 1,
+ 'original' => "\n",
+ 'replacement' => '',
+ ),
+
+ 'rmmulti2' => array(
+ 'line' => 1,
+ 'char' => 2,
+ 'original' => "\n",
+ 'replacement' => '',
+ ),
+
);
$defaults = array(
diff --git a/src/lint/renderer/__tests__/data/rmmulti.expect b/src/lint/renderer/__tests__/data/rmmulti.expect
new file mode 100644
--- /dev/null
+++ b/src/lint/renderer/__tests__/data/rmmulti.expect
@@ -0,0 +1,10 @@
+>>> Lint for path/to/example.c:
+
+
+ Warning (WARN123) Lint Warning
+ Consider this.
+
+ 1 A
+ 2 ~
+ >>> - 3 ~
+ 4 B
diff --git a/src/lint/renderer/__tests__/data/rmmulti.txt b/src/lint/renderer/__tests__/data/rmmulti.txt
new file mode 100644
--- /dev/null
+++ b/src/lint/renderer/__tests__/data/rmmulti.txt
@@ -0,0 +1,4 @@
+A
+
+
+B
diff --git a/src/lint/renderer/__tests__/data/rmmulti2.expect b/src/lint/renderer/__tests__/data/rmmulti2.expect
new file mode 100644
--- /dev/null
+++ b/src/lint/renderer/__tests__/data/rmmulti2.expect
@@ -0,0 +1,10 @@
+>>> Lint for path/to/example.c:
+
+
+ Warning (WARN123) Lint Warning
+ Consider this.
+
+ 1 A
+ >>> - 2 ~
+ 3 ~
+ 4 B
diff --git a/src/lint/renderer/__tests__/data/rmmulti2.txt b/src/lint/renderer/__tests__/data/rmmulti2.txt
new file mode 100644
--- /dev/null
+++ b/src/lint/renderer/__tests__/data/rmmulti2.txt
@@ -0,0 +1,4 @@
+A
+
+
+B

File Metadata

Mime Type
text/plain
Expires
Mon, Mar 31, 5:38 PM (2 d, 8 h ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
7232344
Default Alt Text
D18759.diff (3 KB)

Event Timeline

Phabricator · Built by Phacility