From f58a84408bb9df8c31c13ec11462fc78233e0a95 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Per=20Nordl=C3=B6w?= Date: Thu, 14 Jul 2022 10:33:57 +0200 Subject: [PATCH] Use ASTAllocator again --- src/dcd/server/autocomplete/complete.d | 6 +++--- src/dcd/server/autocomplete/doc.d | 2 +- src/dcd/server/autocomplete/localuse.d | 2 +- src/dcd/server/autocomplete/symbols.d | 4 ++-- src/dcd/server/main.d | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/dcd/server/autocomplete/complete.d b/src/dcd/server/autocomplete/complete.d index ccab196..c346e27 100644 --- a/src/dcd/server/autocomplete/complete.d +++ b/src/dcd/server/autocomplete/complete.d @@ -213,7 +213,7 @@ AutocompleteResponse dotCompletion(T)(T beforeTokens, const(Token)[] tokenArray, mixin(TYPE_IDENT_CASES); case tok!")": case tok!"]": - scope allocator = new SymbolsAllocator(); + scope allocator = new ASTAllocator(); RollbackAllocator rba; ScopeSymbolPair pair = generateAutocompleteTrees(tokenArray, allocator, &rba, cursorPosition, moduleCache); @@ -229,7 +229,7 @@ AutocompleteResponse dotCompletion(T)(T beforeTokens, const(Token)[] tokenArray, case tok!";": case tok!"}": case tok!",": - scope allocator = new SymbolsAllocator(); + scope allocator = new ASTAllocator(); RollbackAllocator rba; ScopeSymbolPair pair = generateAutocompleteTrees(tokenArray, allocator, &rba, 1, moduleCache); @@ -302,7 +302,7 @@ AutocompleteResponse parenCompletion(T)(T beforeTokens, case tok!")": case tok!"]": mixin(STRING_LITERAL_CASES); - scope allocator = new SymbolsAllocator(); + scope allocator = new ASTAllocator(); RollbackAllocator rba; ScopeSymbolPair pair = generateAutocompleteTrees(tokenArray, allocator, &rba, cursorPosition, moduleCache); diff --git a/src/dcd/server/autocomplete/doc.d b/src/dcd/server/autocomplete/doc.d index 67f5408..5d6ee3b 100644 --- a/src/dcd/server/autocomplete/doc.d +++ b/src/dcd/server/autocomplete/doc.d @@ -45,7 +45,7 @@ public AutocompleteResponse getDoc(const AutocompleteRequest request, // trace("Getting doc comments"); AutocompleteResponse response; RollbackAllocator rba; - scope allocator = new SymbolsAllocator(); + scope allocator = new ASTAllocator(); auto cache = StringCache(request.sourceCode.length.optimalBucketCount); SymbolStuff stuff = getSymbolsForCompletion(request, CompletionType.ddoc, allocator, &rba, cache, moduleCache); diff --git a/src/dcd/server/autocomplete/localuse.d b/src/dcd/server/autocomplete/localuse.d index e4cd82c..b3ab16c 100644 --- a/src/dcd/server/autocomplete/localuse.d +++ b/src/dcd/server/autocomplete/localuse.d @@ -45,7 +45,7 @@ public AutocompleteResponse findLocalUse(AutocompleteRequest request, { AutocompleteResponse response; RollbackAllocator rba; - scope allocator = new SymbolsAllocator(); + scope allocator = new ASTAllocator(); auto cache = StringCache(request.sourceCode.length.optimalBucketCount); // patchs the original request for the subsequent requests diff --git a/src/dcd/server/autocomplete/symbols.d b/src/dcd/server/autocomplete/symbols.d index 0a72b0c..d06df7e 100644 --- a/src/dcd/server/autocomplete/symbols.d +++ b/src/dcd/server/autocomplete/symbols.d @@ -47,7 +47,7 @@ public AutocompleteResponse findDeclaration(const AutocompleteRequest request, { AutocompleteResponse response; RollbackAllocator rba; - scope allocator = new SymbolsAllocator(); + scope allocator = new ASTAllocator(); auto cache = StringCache(request.sourceCode.length.optimalBucketCount); SymbolStuff stuff = getSymbolsForCompletion(request, CompletionType.location, allocator, &rba, cache, moduleCache); @@ -75,7 +75,7 @@ public AutocompleteResponse symbolSearch(const AutocompleteRequest request, auto cache = StringCache(request.sourceCode.length.optimalBucketCount); const(Token)[] tokenArray = getTokensForParser(cast(ubyte[]) request.sourceCode, config, &cache); - scope allocator = new SymbolsAllocator(); + scope allocator = new ASTAllocator(); RollbackAllocator rba; ScopeSymbolPair pair = generateAutocompleteTrees(tokenArray, allocator, &rba, request.cursorPosition, moduleCache); diff --git a/src/dcd/server/main.d b/src/dcd/server/main.d index e635ef6..8b70956 100644 --- a/src/dcd/server/main.d +++ b/src/dcd/server/main.d @@ -176,7 +176,7 @@ int runServer(string[] args) info("Sockets shut down."); } - ModuleCache cache = ModuleCache(new SymbolsAllocator); + ModuleCache cache = ModuleCache(new ASTAllocator); cache.addImportPaths(importPaths); infof("Import directories:\n %-(%s\n %)", cache.getImportPaths());