Page MenuHomePhabricator
Files F15443333

D9624.id23084.diff
No OneTemporary
Actions

D9624.id23084.diff
View Options

diff --git a/src/parser/PhutilJSONParser.php b/src/parser/PhutilJSONParser.php
--- a/src/parser/PhutilJSONParser.php
+++ b/src/parser/PhutilJSONParser.php
@@ -23,7 +23,15 @@
try {
return $parser->parse($json);
} catch (JsonLintParsingException $ex) {
- throw new PhutilJSONParserException($ex->getMessage());
+ $details = $ex->getDetails();
+ $message = preg_replace("/^Parse error .*\\^\n/s", '', $ex->getMessage());
+
+ throw new PhutilJSONParserException(
+ $message,
+ nonempty($details['text'], null),
+ $details['token'],
+ $details['line'] + 1,
+ $details['expected']);
}
}
diff --git a/src/parser/__tests__/PhutilJSONParserTestCase.php b/src/parser/__tests__/PhutilJSONParserTestCase.php
--- a/src/parser/__tests__/PhutilJSONParserTestCase.php
+++ b/src/parser/__tests__/PhutilJSONParserTestCase.php
@@ -29,14 +29,49 @@
$parser = new PhutilJSONParser();
$tests = array(
- '{',
- '[',
- '{"foo":',
- '{"foo":"bar",}',
- '{{}',
+ '{' => array(
+ 'text' => null,
+ 'line' => 1,
+ 'token' => 'EOF',
+ ),
+ '[' => array(
+ 'text' => null,
+ 'line' => 1,
+ 'token' => 'EOF',
+ ),
+ '{"foo":' => array(
+ 'text' => null,
+ 'line' => 1,
+ 'token' => 'EOF',
+ ),
+ '{"foo":"bar",}' => array(
+ 'text' => '}',
+ 'line' => 1,
+ 'token' => '}',
+ ),
+ '{{}' => array(
+ 'text' => '{',
+ 'line' => 1,
+ 'token' => '{',
+ ),
+ '{}}' => array(
+ 'text' => '}',
+ 'line' => 1,
+ 'token' => '}',
+ ),
+ "{\"foo\":\"bar\",\n\"bar\":\"baz\",}" => array(
+ 'text' => '}',
+ 'line' => 2,
+ 'token' => '}',
+ ),
+ "{'foo': 'bar'}" => array(
+ 'text' => "'",
+ 'line' => 1,
+ 'token' => 'INVALID',
+ ),
);
- foreach ($tests as $input) {
+ foreach ($tests as $input => $expected) {
$caught = null;
try {
$parser->parse($input);
@@ -44,6 +79,9 @@
$caught = $ex;
}
$this->assertTrue($caught instanceof PhutilJSONParserException);
+ $this->assertEqual($expected['text'], $caught->getSourceText());
+ $this->assertEqual($expected['line'], $caught->getSourceLine());
+ $this->assertEqual($expected['token'], $caught->getSourceToken());
}
}
diff --git a/src/parser/exception/PhutilJSONParserException.php b/src/parser/exception/PhutilJSONParserException.php
--- a/src/parser/exception/PhutilJSONParserException.php
+++ b/src/parser/exception/PhutilJSONParserException.php
@@ -1,3 +1,35 @@
<?php
-final class PhutilJSONParserException extends Exception {}
+final class PhutilJSONParserException extends Exception {
+
+ private $sourceText;
+ private $sourceToken;
+ private $sourceLine;
+ private $expected;
+
+ public function __construct($message, $text, $token, $line, array $expected) {
+ $this->sourceText = $text;
+ $this->sourceToken = $token;
+ $this->sourceLine = $line;
+ $this->expected = $expected;
+
+ parent::__construct($message);
+ }
+
+ public function getSourceText() {
+ return $this->sourceText;
+ }
+
+ public function getSourceToken() {
+ return $this->sourceToken;
+ }
+
+ public function getSourceLine() {
+ return $this->sourceLine;
+ }
+
+ public function getExpectedTokens() {
+ return $this->expected;
+ }
+
+}

File Metadata

Mime Type
text/plain
Expires
Fri, Mar 28, 3:48 AM (1 w, 1 d ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
7725090
Default Alt Text
D9624.id23084.diff (3 KB)

Event Timeline

Phabricator · Built by Phacility