From 9b7414367d74b9786ee5bface24aea3d9067dc4c Mon Sep 17 00:00:00 2001 From: Basile Burg Date: Tue, 6 Nov 2018 09:15:40 +0100 Subject: [PATCH] Update to dparse 0.10.x --- dsymbol | 2 +- dub.json | 4 ++-- libdparse | 2 +- src/dcd/server/autocomplete/complete.d | 2 +- src/dcd/server/autocomplete/doc.d | 4 ++-- src/dcd/server/autocomplete/localuse.d | 2 +- src/dcd/server/autocomplete/symbols.d | 4 ++-- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dsymbol b/dsymbol index 47f4711..b3b4616 160000 --- a/dsymbol +++ b/dsymbol @@ -1 +1 @@ -Subproject commit 47f471114ad272dc0cd41996c7977413d7a68d63 +Subproject commit b3b4616601ff4dad529b5acf927aaf85c21559a2 diff --git a/dub.json b/dub.json index 810f3b4..5206715 100644 --- a/dub.json +++ b/dub.json @@ -7,8 +7,8 @@ ], "license": "GPL-3.0", "dependencies": { - "dsymbol": "~>0.4.8", - "libdparse": "~>0.9.9", + "dsymbol": "~>0.5.2", + "libdparse": "~>0.10.6", "msgpack-d": "~>1.0.0-beta.3", "stdx-allocator": "~>2.77.4" }, diff --git a/libdparse b/libdparse index 95444a9..6a1c48f 160000 --- a/libdparse +++ b/libdparse @@ -1 +1 @@ -Subproject commit 95444a966923a24098c31464e09a7096208da155 +Subproject commit 6a1c48f8bdc6e8bb890039aa67c03a4910b55d65 diff --git a/src/dcd/server/autocomplete/complete.d b/src/dcd/server/autocomplete/complete.d index 3ac6e85..454e578 100644 --- a/src/dcd/server/autocomplete/complete.d +++ b/src/dcd/server/autocomplete/complete.d @@ -54,7 +54,7 @@ public AutocompleteResponse complete(const AutocompleteRequest request, ref ModuleCache moduleCache) { const(Token)[] tokenArray; - auto stringCache = StringCache(StringCache.defaultBucketCount); + auto stringCache = StringCache(request.sourceCode.length.optimalBucketCount); auto beforeTokens = getTokensBeforeCursor(request.sourceCode, request.cursorPosition, stringCache, tokenArray); diff --git a/src/dcd/server/autocomplete/doc.d b/src/dcd/server/autocomplete/doc.d index 567e6c1..2b40e8d 100644 --- a/src/dcd/server/autocomplete/doc.d +++ b/src/dcd/server/autocomplete/doc.d @@ -46,7 +46,7 @@ public AutocompleteResponse getDoc(const AutocompleteRequest request, AutocompleteResponse response; RollbackAllocator rba; auto allocator = scoped!(ASTAllocator)(); - auto cache = StringCache(StringCache.defaultBucketCount); + auto cache = StringCache(request.sourceCode.length.optimalBucketCount); SymbolStuff stuff = getSymbolsForCompletion(request, CompletionType.ddoc, allocator, &rba, cache, moduleCache); if (stuff.symbols.length == 0) @@ -70,4 +70,4 @@ public AutocompleteResponse getDoc(const AutocompleteRequest request, } } return response; -} \ No newline at end of file +} diff --git a/src/dcd/server/autocomplete/localuse.d b/src/dcd/server/autocomplete/localuse.d index 6b42f17..5ef9bcd 100644 --- a/src/dcd/server/autocomplete/localuse.d +++ b/src/dcd/server/autocomplete/localuse.d @@ -46,7 +46,7 @@ public AutocompleteResponse findLocalUse(AutocompleteRequest request, AutocompleteResponse response; RollbackAllocator rba; auto allocator = scoped!(ASTAllocator)(); - auto cache = StringCache(StringCache.defaultBucketCount); + auto cache = StringCache(request.sourceCode.length.optimalBucketCount); // patchs the original request for the subsequent requests request.kind = RequestKind.symbolLocation; diff --git a/src/dcd/server/autocomplete/symbols.d b/src/dcd/server/autocomplete/symbols.d index bc610f4..55075e1 100644 --- a/src/dcd/server/autocomplete/symbols.d +++ b/src/dcd/server/autocomplete/symbols.d @@ -48,7 +48,7 @@ public AutocompleteResponse findDeclaration(const AutocompleteRequest request, AutocompleteResponse response; RollbackAllocator rba; auto allocator = scoped!(ASTAllocator)(); - auto cache = StringCache(StringCache.defaultBucketCount); + auto cache = StringCache(request.sourceCode.length.optimalBucketCount); SymbolStuff stuff = getSymbolsForCompletion(request, CompletionType.location, allocator, &rba, cache, moduleCache); scope(exit) stuff.destroy(); @@ -72,7 +72,7 @@ public AutocompleteResponse symbolSearch(const AutocompleteRequest request, LexerConfig config; config.fileName = ""; - auto cache = StringCache(StringCache.defaultBucketCount); + auto cache = StringCache(request.sourceCode.length.optimalBucketCount); const(Token)[] tokenArray = getTokensForParser(cast(ubyte[]) request.sourceCode, config, &cache); auto allocator = scoped!(ASTAllocator)();