1
0
Fork 0

Merge branch 'master' into master_75

pull/76/head
Felix Becker 2016-10-20 19:06:52 +02:00 committed by GitHub
commit ca36302b8f
1 changed files with 1 additions and 2 deletions

View File

@ -169,7 +169,6 @@ class LanguageServer extends AdvancedJsonRpc\Dispatcher
$uri = pathToUri($file); $uri = pathToUri($file);
$fileNum++; $fileNum++;
$shortName = substr($file, strlen($this->rootPath) + 1); $shortName = substr($file, strlen($this->rootPath) + 1);
$this->client->window->logMessage(MessageType::INFO, "Parsing file $fileNum/$numTotalFiles: $shortName.");
if (filesize($file) > 500000) { if (filesize($file) > 500000) {
$this->client->window->logMessage(MessageType::INFO, "Not parsing $shortName because it exceeds size limit of 0.5MB"); $this->client->window->logMessage(MessageType::INFO, "Not parsing $shortName because it exceeds size limit of 0.5MB");
@ -178,7 +177,7 @@ class LanguageServer extends AdvancedJsonRpc\Dispatcher
try { try {
$this->project->loadDocument($uri); $this->project->loadDocument($uri);
} catch (Exception $e) { } catch (Exception $e) {
$this->client->window->logMessage(MessageType::ERROR, "Error parsing file $shortName: " . $e->getMessage()); $this->client->window->logMessage(MessageType::ERROR, "Error parsing file $shortName: " . (string)$e);
} }
} }