From 47472252a758cdf87204bfa4f5f2ec7b368c3b70 Mon Sep 17 00:00:00 2001
From: Felix Becker <felix.b@outlook.com>
Date: Mon, 7 Nov 2016 10:24:49 +0100
Subject: [PATCH 1/2] Encode spaces in paths to %20 instead of + (#140)

---
 src/utils.php               | 2 +-
 tests/Utils/FileUriTest.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/utils.php b/src/utils.php
index 810fbc1..58b07ea 100644
--- a/src/utils.php
+++ b/src/utils.php
@@ -39,7 +39,7 @@ function pathToUri(string $filepath): string
     if (substr($first, -1) !== ':') {
         $first = urlencode($first);
     }
-    $parts = array_map('urlencode', $parts);
+    $parts = array_map('rawurlencode', $parts);
     array_unshift($parts, $first);
     $filepath = implode('/', $parts);
     return 'file:///' . $filepath;
diff --git a/tests/Utils/FileUriTest.php b/tests/Utils/FileUriTest.php
index 62d715f..4737314 100644
--- a/tests/Utils/FileUriTest.php
+++ b/tests/Utils/FileUriTest.php
@@ -25,7 +25,7 @@ class FileUriTest extends TestCase
 
         // special chars are escaped
         $uri = pathToUri('c:/path/to/file/dürüm döner.php');
-        $this->assertEquals('file:///c:/path/to/file/d%C3%BCr%C3%BCm+d%C3%B6ner.php', $uri);
+        $this->assertEquals('file:///c:/path/to/file/d%C3%BCr%C3%BCm%20d%C3%B6ner.php', $uri);
 
         //backslashes are transformed
         $uri = pathToUri('c:\\foo\\bar.baz');

From 25f300c157513426336403f3c62e75e0eea41223 Mon Sep 17 00:00:00 2001
From: Felix Becker <felix.b@outlook.com>
Date: Mon, 7 Nov 2016 11:52:24 +0100
Subject: [PATCH 2/2] Add test for indexing

---
 src/LanguageServer.php       |  2 +-
 tests/LanguageServerTest.php | 24 +++++++++++++++++++++++-
 2 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/src/LanguageServer.php b/src/LanguageServer.php
index 11a45db..ddcddc7 100644
--- a/src/LanguageServer.php
+++ b/src/LanguageServer.php
@@ -183,7 +183,7 @@ class LanguageServer extends AdvancedJsonRpc\Dispatcher
             } else {
                 $duration = (int)(microtime(true) - $startTime);
                 $mem = (int)(memory_get_usage(true) / (1024 * 1024));
-                $this->client->window->logMessage(MessageType::INFO, "All PHP files parsed in $duration seconds. $mem MiB allocated.");
+                $this->client->window->logMessage(MessageType::INFO, "All $numTotalFiles PHP files parsed in $duration seconds. $mem MiB allocated.");
             }
         };
 
diff --git a/tests/LanguageServerTest.php b/tests/LanguageServerTest.php
index 1c4e278..3f0c314 100644
--- a/tests/LanguageServerTest.php
+++ b/tests/LanguageServerTest.php
@@ -5,8 +5,10 @@ namespace LanguageServer\Tests;
 
 use PHPUnit\Framework\TestCase;
 use LanguageServer\LanguageServer;
-use LanguageServer\Protocol\{Message, ClientCapabilities, TextDocumentSyncKind};
+use LanguageServer\Protocol\{Message, ClientCapabilities, TextDocumentSyncKind, MessageType};
 use AdvancedJsonRpc;
+use Sabre\Event\Promise;
+use function LanguageServer\pathToUri;
 
 class LanguageServerTest extends TestCase
 {
@@ -46,4 +48,24 @@ class LanguageServerTest extends TestCase
             ]
         ], $msg->body->result);
     }
+
+    public function testIndexing()
+    {
+        $promise = new Promise;
+        $input = new MockProtocolStream;
+        $output = new MockProtocolStream;
+        $output->on('message', function (Message $msg) use ($promise) {
+            if ($msg->body->method === 'window/logMessage') {
+                if ($msg->body->params->type === MessageType::ERROR) {
+                    $promise->reject();
+                } else if (strpos($msg->body->params->message, 'All 10 PHP files parsed') !== false) {
+                    $promise->fulfill();
+                }
+            }
+        });
+        $server = new LanguageServer($input, $output);
+        $capabilities = new ClientCapabilities;
+        $server->initialize(getmypid(), $capabilities, realpath(__DIR__ . '/../fixtures'));
+        $promise->wait();
+    }
 }