diff --git a/packages/ace-linters/src/services/typescript/typescript-converters.ts b/packages/ace-linters/src/services/typescript/typescript-converters.ts
index b321492..ba67eb0 100644
--- a/packages/ace-linters/src/services/typescript/typescript-converters.ts
+++ b/packages/ace-linters/src/services/typescript/typescript-converters.ts
@@ -161,10 +161,14 @@ export function toCompletions(completionInfo: CompletionInfo, doc: TextDocument,
 }
 
 export function toResolvedCompletion(entry: CompletionEntryDetails): lsp.CompletionItem {
+    let documentation = entry.displayParts.map((displayPart) => displayPart.text).join('');
+    if (entry.documentation) {
+        documentation += "\n\n" + entry.documentation.map((displayPart) => displayPart.text).join('');
+    }
     return {
         label: entry.name,
         kind: convertKind(entry.kind),
-        documentation: entry.displayParts.map((displayPart) => displayPart.text).join('')
+        documentation: documentation
     };
 }
 
diff --git a/packages/ace-linters/src/services/typescript/typescript-service.ts b/packages/ace-linters/src/services/typescript/typescript-service.ts
index 2677eaa..1d49f19 100644
--- a/packages/ace-linters/src/services/typescript/typescript-service.ts
+++ b/packages/ace-linters/src/services/typescript/typescript-service.ts
@@ -63,7 +63,8 @@ export class TypescriptService extends BaseService<TsServiceOptions> implements
 
     serviceCapabilities = {
         completionProvider: {
-            triggerCharacters: ['.', '"', '\'', '`', '/', '@', '<', '#']
+            triggerCharacters: ['.', '"', '\'', '`', '/', '@', '<', '#'],
+            resolveProvider: true
         },
         diagnosticProvider: {
             interFileDependencies: true,
@@ -273,7 +274,7 @@ export class TypescriptService extends BaseService<TsServiceOptions> implements
 
     async doResolve(item: lsp.CompletionItem): Promise<lsp.CompletionItem | null> {
         let resolvedCompletion = this.$service.getCompletionEntryDetails(
-            item["fileName"],
+            item["fileName"].documentUri,
             item["position"],
             item.label,
             undefined,
diff --git a/packages/ace-linters/types/services/typescript/typescript-service.d.ts b/packages/ace-linters/types/services/typescript/typescript-service.d.ts
index 8844bd1..c81dd72 100644
--- a/packages/ace-linters/types/services/typescript/typescript-service.d.ts
+++ b/packages/ace-linters/types/services/typescript/typescript-service.d.ts
@@ -32,6 +32,7 @@ export declare class TypescriptService extends BaseService<TsServiceOptions> imp
     serviceCapabilities: {
         completionProvider: {
             triggerCharacters: string[];
+            resolveProvider: boolean;
         };
         diagnosticProvider: {
             interFileDependencies: boolean;