Get rid of redundant property

Author: skovhus

server/src/__tests__/server.test.ts

@@ -484,7 +484,6 @@ describe('server', () => {
       expect.arrayContaining([
         {
           data: {
-            name: 'rm',
             type: CompletionItemDataType.Executable,
           },
           kind: expect.any(Number),
@@ -634,7 +633,6 @@ describe('server', () => {
       Array [
         Object {
           "data": Object {
-            "name": "BLUE",
             "type": 3,
           },
           "documentation": Object {
@@ -666,7 +664,6 @@ describe('server', () => {
       Array [
         Object {
           "data": Object {
-            "name": "add_a_user",
             "type": 3,
           },
           "documentation": Object {
@@ -708,7 +705,6 @@ describe('server', () => {
       Array [
         Object {
           "data": Object {
-            "name": "BOLD",
             "type": 3,
           },
           "documentation": undefined,
@@ -747,7 +743,6 @@ describe('server', () => {
       Array [
         Object {
           "data": Object {
-            "name": "BOLD",
             "type": 3,
           },
           "documentation": undefined,
@@ -756,7 +751,6 @@ describe('server', () => {
         },
         Object {
           "data": Object {
-            "name": "RED",
             "type": 3,
           },
           "documentation": Object {
@@ -768,7 +762,6 @@ describe('server', () => {
         },
         Object {
           "data": Object {
-            "name": "GREEN",
             "type": 3,
           },
           "documentation": Object {
@@ -780,7 +773,6 @@ describe('server', () => {
         },
         Object {
           "data": Object {
-            "name": "BLUE",
             "type": 3,
           },
           "documentation": Object {
@@ -792,7 +784,6 @@ describe('server', () => {
         },
         Object {
           "data": Object {
-            "name": "RESET",
             "type": 3,
           },
           "documentation": Object {

server/src/server.ts

@@ -344,7 +344,6 @@ export default class BashServer {
         label: symbol.name,
         kind: symbolKindToCompletionKind(symbol.kind),
         data: {
-          name: symbol.name,
           type: CompletionItemDataType.Symbol,
         },
         documentation:
@@ -503,7 +502,6 @@ export default class BashServer {
       label: reservedWord,
       kind: LSP.CompletionItemKind.Keyword,
       data: {
-        name: reservedWord,
         type: CompletionItemDataType.ReservedWord,
       },
     }))
@@ -516,7 +514,6 @@ export default class BashServer {
           label: executable,
           kind: LSP.CompletionItemKind.Function,
           data: {
-            name: executable,
             type: CompletionItemDataType.Executable,
           },
         }
@@ -526,7 +523,6 @@ export default class BashServer {
       label: builtin,
       kind: LSP.CompletionItemKind.Function,
       data: {
-        name: builtin,
         type: CompletionItemDataType.Builtin,
       },
     }))
@@ -535,7 +531,6 @@ export default class BashServer {
       label: option,
       kind: LSP.CompletionItemKind.Constant,
       data: {
-        name: option,
         type: CompletionItemDataType.Symbol,
       },
     }))
@@ -560,10 +555,11 @@ export default class BashServer {
     item: LSP.CompletionItem,
   ): Promise<LSP.CompletionItem> {
     const {
-      data: { name, type },
+      label,
+      data: { type },
     } = item as BashCompletionItem
 
-    logger.debug(`onCompletionResolve name=${name} type=${type}`)
+    logger.debug(`onCompletionResolve label=${label} type=${type}`)
 
     try {
       let documentation = null
@@ -573,7 +569,7 @@ export default class BashServer {
         type === CompletionItemDataType.Builtin ||
         type === CompletionItemDataType.ReservedWord
       ) {
-        documentation = await getShellDocumentation({ word: name })
+        documentation = await getShellDocumentation({ word: label })
       }
 
       return documentation

server/src/types.ts

@@ -10,6 +10,5 @@ export enum CompletionItemDataType {
 export interface BashCompletionItem extends LSP.CompletionItem {
   data: {
     type: CompletionItemDataType
-    name: string
   }
 }