more verbose document outline + fix some scopes

fix #463
Pure-D · Nov 2, 2023 · ac0b6c3 · ac0b6c3
1 parent df3033d
commit ac0b6c3
Show file tree

Hide file tree

Showing 9 changed files with 307 additions and 191 deletions.
diff --git a/source/served/commands/complete.d b/source/served/commands/complete.d
@@ -197,6 +197,8 @@ SymbolKind convertFromDscannerType(char type, string name = null)
 		return SymbolKind.variable;
 	case 'a':
 		return SymbolKind.field;
+	case ':':
+		return SymbolKind.module_;
 	default:
 		return cast(SymbolKind) 0;
 	}

diff --git a/source/served/commands/symbol_search.d b/source/served/commands/symbol_search.d
@@ -57,7 +57,7 @@ JsonValue provideDocumentSymbols(DocumentSymbolParams params)
 		.hierarchicalDocumentSymbolSupport.orDefault)
 		return provideDocumentSymbolsHierarchical(params).toJsonValue;
 	else
-		return provideDocumentSymbolsOld(DocumentSymbolParamsEx(params)).map!"a.downcast".array.toJsonValue;
+		return provideDocumentSymbolsOld(DocumentSymbolParamsEx(params, true)).map!"a.downcast".array.toJsonValue;
 }
 
 private struct OldSymbolsCache
@@ -120,8 +120,10 @@ SymbolInformationEx makeSymbolInfoEx(scope const ref DefinitionElement def, stri
 		info.containerName = *ptr;
 	if ("deprecation" in attribs)
 		info.tags = [SymbolTag.deprecated_];
-	if (auto name = "name" in attribs)
-		info.detail = *name;
+	if (auto signature = "signature" in attribs)
+		info.detail = *signature;
+	if (auto detail = "detail" in attribs)
+		info.detail = *detail;
 	return info;
 }
 
@@ -140,7 +142,7 @@ DocumentSymbolInfo[] provideDocumentSymbolsHierarchical(DocumentSymbolParams par
 	if (cached.length)
 		return cached;
 	DocumentSymbolInfo[] all;
-	auto symbols = provideDocumentSymbolsOld(DocumentSymbolParamsEx(params));
+	auto symbols = provideDocumentSymbolsOld(DocumentSymbolParamsEx(params, true));
 	foreach (symbol; symbols)
 	{
 		DocumentSymbolInfo sym;

diff --git a/source/served/lsp/protoext.d b/source/served/lsp/protoext.d
@@ -161,6 +161,12 @@ struct DocumentSymbolParamsEx
 		textDocument = params.textDocument;
 	}
 
+	this(DocumentSymbolParams params, bool verbose)
+	{
+		textDocument = params.textDocument;
+		this.verbose = verbose;
+	}
+
 	this(TextDocumentIdentifier textDocument, bool verbose)
 	{
 		this.textDocument = textDocument;

diff --git a/test/data/list_definition/_basic.d b/test/data/list_definition/_basic.d
@@ -23,7 +23,7 @@ unittest
 {
 }
 
-class X
+private class X
 {
 	this(int x) {}
 	this(this) {}
@@ -40,8 +40,8 @@ shared static this()
 
 __EOF__
 hello	6	f	{"signature": "()", "access": "public", "return": "void"}	46	74
-y	10	v	{"access": "public"}	76	86
+y	10	v	{"access": "public", "detail": "int"}	76	86
 bar	13	f	{"signature": "()", "access": "public", "return": "int"}	88	101
-X	26	c	{"access": "public"}	144	215
-this	28	f	{"signature": "(int x)", "access": "public", "class": "X"}	155	169
-~this	30	f	{"access": "public", "class": "X"}	186	196
+X	26	c	{"access": "private", "detail": "class"}	152	223
+this	28	f	{"signature": "(int x)", "access": "public", "class": "X"}	163	177
+~this	30	f	{"access": "public", "class": "X"}	194	204
diff --git a/test/data/list_definition/_verbose.d b/test/data/list_definition/_verbose.d
@@ -14,7 +14,7 @@ bar()
 {
 }
 
-unittest
+deprecated unittest
 {
 }
 
@@ -43,13 +43,13 @@ __EOF__
 Foo	3	V	{"access": "public"}	17	31
 Bar	4	D	{"access": "public"}	32	44
 hello	6	f	{"signature": "()", "access": "public", "return": "void"}	46	74
-y	10	v	{"access": "public"}	76	86
+y	10	v	{"access": "public", "detail": "int"}	76	86
 bar	13	f	{"signature": "()", "access": "public", "return": "int"}	88	101
-__unittest_L17_C1	17	U	{"access": "public"}	103	115
-__unittest_L22_C1	22	U	{"access": "public", "name": "named"}	130	142
-X	26	c	{"access": "public"}	144	215
-this	28	f	{"signature": "(int x)", "access": "public", "class": "X"}	155	169
-this(this)	29	f	{"access": "public", "class": "X"}	171	184
-~this	30	f	{"access": "public", "class": "X"}	186	196
-__unittest_L32_C2	32	U	{"access": "public", "class": "X"}	199	213
-shared static this()	37	S	{"access": "public"}	217	241
+__unittest_L17_C12	17	U	{"deprecation":"", "access": "public"}	114	126
+__unittest_L22_C1	22	U	{"access": "public", "detail": "named"}	141	153
+X	26	c	{"access": "public", "detail": "class"}	155	226
+this	28	f	{"signature": "(int x)", "access": "public", "class": "X"}	166	180
+this(this)	29	f	{"access": "public", "class": "X"}	182	195
+~this	30	f	{"access": "public", "class": "X"}	197	207
+__unittest_L32_C2	32	U	{"access": "public", "class": "X"}	210	224
+shared static this()	37	S	{"access": "public"}	228	252
diff --git a/test/data/list_definition/static_ctors.d b/test/data/list_definition/static_ctors.d
@@ -9,6 +9,6 @@ public class Foo : Bar {
 }
 __EOF__
 :verbose=true
-Foo	1	c	{"access":"public"}	7	111
+Foo	1	c	{"access":"public", "detail":"class"}	7	111
 static this()	2	C	{"access": "public", "class": "Foo"}	26	93
-arr	8	v	{"access":"public","class":"Foo"}	96	109
+arr	8	v	{"access":"public", "class":"Foo", "detail":"int[256]"}	96	109