forks
/
dlangide
mirror of https://github.com/buggins/dlangide.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Bump DCD version for tha sweet UFCS support. 

Also, removed DCD submodule bacuse it's a dub dependency anyway. Closes #397
This commit is contained in:
Grim Maple 2022-10-22 14:42:16 +03:00
parent 8c072de2af
commit 72ea89b6ec
4 changed files with 4 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitmodules vendored
View File

@ -1,3 +0,0 @@
[submodule "deps/DCD"]
path = deps/DCD
url = https://github.com/Hackerpilot/DCD.git

1
deps/DCD vendored

@ -1 +0,0 @@
Subproject commit cbcc6faac3f820bb8e06ed132d82d13036e34d58

5
dub.json
View File

@ -12,9 +12,8 @@
"stringImportPaths": ["views"], "stringImportPaths": ["views"],
"dependencies": { "dependencies": {
"dlangui": "~>0.9.187", "dlangui": "~>0.9.188",
"dsymbol": "~>0.11.2", "dcd": "~>0.15.0-beta.1"
"dcd": "~>0.13.6"
}, },
"copyFiles-windows": [ "copyFiles-windows": [

12
src/dlangide/tools/d/dcdinterface.d
View File

@ -19,11 +19,6 @@ import dcd.server.autocomplete;
import dcd.common.messages; import dcd.common.messages;
import dsymbol.modulecache; import dsymbol.modulecache;
//alias SharedASTAllocator = CAllocatorImpl!(Mallocator);
//alias SharedASTAllocator = CAllocatorImpl!(Mallocator);
//alias SharedASTAllocator = CSharedAllocatorImpl!(Mallocator);
alias SharedASTAllocator = ASTAllocator;
enum DCDResult : int { enum DCDResult : int {
SUCCESS, SUCCESS,
NO_RESULT, NO_RESULT,
@ -92,11 +87,9 @@ class DCDTask {
} }
class ModuleCacheAccessor { class ModuleCacheAccessor {
import dsymbol.modulecache;
//protected ASTAllocator _astAllocator;
protected ModuleCache _moduleCache; protected ModuleCache _moduleCache;
this(in string[] importPaths) { this(in string[] importPaths) {
_moduleCache = ModuleCache(new SharedASTAllocator); _moduleCache = ModuleCache();
_moduleCache.addImportPaths(importPaths); _moduleCache.addImportPaths(importPaths);
} }
protected ModuleCache * getModuleCache(in string[] importPaths) { protected ModuleCache * getModuleCache(in string[] importPaths) {
@ -109,8 +102,6 @@ class ModuleCacheAccessor {
class DCDInterface : Thread { class DCDInterface : Thread {
import dsymbol.modulecache; import dsymbol.modulecache;
//protected ASTAllocator _astAllocator;
//protected ModuleCache * _moduleCache;
ModuleCacheAccessor _moduleCache; ModuleCacheAccessor _moduleCache;
protected BlockingQueue!DCDTask _queue; protected BlockingQueue!DCDTask _queue;
@ -362,6 +353,7 @@ int completionTypePriority(char t) {
return 3; return 3;
case 'k': // - keyword, built-in version, scope statement case 'k': // - keyword, built-in version, scope statement
return 20; return 20;
case 'F':
case 'f': // - function or method case 'f': // - function or method
return 2; return 2;
case 'g': // - enum name case 'g': // - enum name