Epic - Mejoras autocompletado

client/package.json

@@ -1,5 +1,5 @@
 {
-  "name": "wollok-linter-client",
+  "name": "wollok-lsp-ide-client",
   "description": "VSCode part of a language server",
   "author": "Microsoft Corporation",
   "license": "LGPL-3.0",

client/src/test/completion.test.ts

@@ -8,28 +8,71 @@ import {
 } from 'vscode'
 import { getDocumentURI, activate } from './helper'
 
-const WOLLOK_AUTOCOMPLETE = 'wollok_autocomplete'
-
 suite('Should do completion', () => {
-  const docUri = getDocumentURI('completion.wlk')
-  const fileCompletion = {
+
+  const fileSnippets = {
     items: [
-      { label: 'class', kind: CompletionItemKind.Class },
-      { label: 'describe', kind: CompletionItemKind.Event },
-      { label: 'method (with effect)', kind: CompletionItemKind.Method },
-      { label: 'method (without effect)', kind: CompletionItemKind.Method },
-      { label: 'object', kind: CompletionItemKind.Text },
-      { label: 'test', kind: CompletionItemKind.Event },
+      {
+        label: "import",
+        kind: CompletionItemKind.File,
+      }, {
+        label: "const attribute",
+        kind: CompletionItemKind.Field,
+      }, {
+        label: "object",
+        kind: CompletionItemKind.Module,
+      }, {
+        label: "class",
+        kind: CompletionItemKind.Class,
+      },
     ],
   }
 
-  test('Completes Wollok file', async () => {
-    await testCompletion(docUri, new Position(0, 0), fileCompletion)
+  test('Completes Wollok definition file', async () => {
+    await testCompletion(getDocumentURI('completion.wlk'), new Position(0, 0), fileSnippets)
+  })
+
+  test('Completes Wollok test file', async () => {
+      await testCompletion(getDocumentURI('completionTest.wtest'), new Position(0, 0), { items: [
+        {
+          label:"import",
+          kind: CompletionItemKind.File,
+        }, {
+          label: "const attribute",
+          kind: CompletionItemKind.Field,
+        }, {
+          label:"object",
+          kind: CompletionItemKind.Module,
+        }, {
+          label:"class",
+          kind: CompletionItemKind.Class,
+        }, {
+          label: "describe",
+          kind: CompletionItemKind.Folder,
+        }, {
+          label: "test",
+          kind: CompletionItemKind.Event,
+        },
+      ],
+    })
   })
 
-  test('Completes unparsed node', async () => {
-    await testCompletion(docUri, new Position(2, 3), fileCompletion)
+  test('Completes Wollok program file', async () => {
+      await testCompletion(getDocumentURI('completionProgram.wpgm'), new Position(0, 0), { items: [
+        {
+          label:"import",
+          kind: CompletionItemKind.File,
+        }, {
+          label: "const attribute",
+          kind: CompletionItemKind.Field,
+        }, {
+          label: "program",
+          kind: CompletionItemKind.Unit,
+        },
+      ],
+    })
   })
+
 })
 
 async function testCompletion(
@@ -40,22 +83,19 @@ async function testCompletion(
   await activate(docUri)
 
   // Executing the command `executeCompletionItemProvider` to simulate triggering completion
-  const actualCompletionList = (await commands.executeCommand(
+  const wollokCompletionList = (await commands.executeCommand(
     'vscode.executeCompletionItemProvider',
     docUri,
     position,
   )) as CompletionList
 
-  const wollokCompletionList = actualCompletionList.items.filter(
-    (completionElement) => completionElement.detail === WOLLOK_AUTOCOMPLETE,
-  )
   assert.equal(
     expectedCompletionList.items.length,
-    wollokCompletionList.length,
-    JSON.stringify(actualCompletionList),
+    wollokCompletionList.items.length,
+    JSON.stringify(wollokCompletionList),
   )
   expectedCompletionList.items.forEach((expectedItem, i) => {
-    const actualItem = wollokCompletionList[i]
+    const actualItem = wollokCompletionList.items[i]
     assert.equal(actualItem.label, expectedItem.label)
     assert.equal(actualItem.kind, expectedItem.kind)
   })

client/testFixture/pepita.wlk

@@ -3,3 +3,4 @@ object Pepita {
 }
 
 class a {}
+

package.json

@@ -120,7 +120,7 @@
       {
         "command": "wollok.start.repl",
         "title": "Start a new REPL session",
-                "category": "Wollok"
+        "category": "Wollok"
       },
       {
         "command": "wollok.run.allTests",
@@ -145,7 +145,7 @@
     "lint-staged": "lint-staged"
   },
   "dependencies": {
-    "wollok-ts": "4.0.4"
+    "wollok-ts": "4.0.5"
   },
   "devDependencies": {
     "@types/expect": "^24.3.0",

server/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wollok-lsp-ide-server",
-  "description": "Wollok Linter - LSP implementation in node.",
+  "description": "Wollok IDE - LSP implementation in node.",
   "version": "0.0.1",
   "author": "Uqbar Foundation",
   "license": "LGPL-3.0",

server/src/functionalities/autocomplete/autocomplete.ts

@@ -1,5 +1,8 @@
 import { CompletionItem, CompletionItemKind, InsertTextFormat } from 'vscode-languageserver'
-import { Field, Method, Module, Name, Node, Parameter, Singleton } from 'wollok-ts'
+import { Class, Entity, Field, Method, Mixin, Module, Name, Node, Parameter, Reference, Singleton } from 'wollok-ts'
+import { OBJECT_CLASS, parentModule, projectFQN } from '../../utils/vm/wollok'
+import { match, when } from 'wollok-ts/dist/extensions'
+
 
 // -----------------
 // -----MAPPERS-----
@@ -12,16 +15,55 @@ export const fieldCompletionItem: CompletionItemMapper<Field> = namedCompletionI
 
 export const singletonCompletionItem: CompletionItemMapper<Singleton> = moduleCompletionItem(CompletionItemKind.Class)
 
-export const methodCompletionItem: CompletionItemMapper<Method> = (method) => {
-  const params = method.parameters.map((p, i) => `\${${i+1}:${p.name}}`).join(', ')
+/**
+ * We want
+ * - first: methods belonging to the same file we are using
+ * - then, concrete classes/singletons
+ * - then, library methods having this order: 1. lang, 2. lib, 3. game
+ * - and last: object
+ */
+const getSortText = (node: Node, method: Method) => {
+  const methodContainer = parentModule(method)
+  return formatSortText((node.sourceFileName === method.sourceFileName ? 1 : getLibraryIndex(method)) + additionalIndex(method, methodContainer))
+}
+
+const getLibraryIndex = (node: Node) => {
+  switch (node.sourceFileName) {
+    case 'wollok/lang.wlk': {
+      return 20
+    }
+    case 'wollok/lib.wlk': {
+      return 30
+    }
+    case 'wollok/game.wlk': {
+      return 40
+    }
+    default: {
+      return 10
+    }
+  }
+}
+
+const formatSortText = (index: number) => ('000' + index).slice(-3)
+
+const additionalIndex = (method: Method, methodContainer: Module): number => {
+  if (methodContainer.fullyQualifiedName === OBJECT_CLASS) return 50
+  if (methodContainer instanceof Class && methodContainer.isAbstract) return 5
+  if (method.isAbstract()) return 3
+  return 1
+}
+
+export const methodCompletionItem = (node: Node, method: Method): CompletionItem => {
+  const params = method.parameters.map((parameter, i) => `\${${i+1}:${parameter.name}}`).join(', ')
   return {
     label: method.name,
     filterText: method.name,
     insertTextFormat: InsertTextFormat.Snippet,
     insertText: `${method.name}(${params})`,
     kind: CompletionItemKind.Method,
     detail: `${method.parent.name} \n\n\n File ${method.parent.sourceFileName?.split('/').pop()}`,
-    labelDetails: { description: method.parent.name, detail: `(${method.parameters.map(p => p.name).join(', ')})` },
+    labelDetails: { description: method.parent.name, detail: `(${method.parameters.map(parameter => parameter.name).join(', ')})` },
+    sortText: getSortText(node, method),
   }
 }
 
@@ -37,6 +79,48 @@ function namedCompletionItem<T extends {name: string}>(kind: CompletionItemKind)
       insertText: namedNode.name,
       insertTextFormat: InsertTextFormat.PlainText,
       kind,
+      sortText: '001',
     }
   }
+}
+
+export const classCompletionItem = (clazz: Class): CompletionItem => {
+  return {
+    label: clazz.name,
+    filterText: clazz.name,
+    insertTextFormat: InsertTextFormat.PlainText,
+    insertText: `${clazz.name}`,
+    kind: CompletionItemKind.Class,
+    detail: `${clazz.name} \n\n\n File ${clazz.parent.sourceFileName?.split('/').pop()}`,
+    sortText: formatSortText(getLibraryIndex(clazz)),
+  }
+}
+
+export const initializerCompletionItem = (clazz: Class): CompletionItem => {
+  // TODO: export getAllUninitializedAttributes from wollok-ts and use it
+  const initializers = clazz.allFields.map((member, i) => `\${${2*i+1}:${member.name}} = \${${2*i+2}}`).join(', ')
+  return {
+    label: 'initializers',
+    filterText: 'initializers',
+    insertTextFormat: InsertTextFormat.Snippet,
+    insertText: initializers,
+    kind: CompletionItemKind.Constructor,
+    sortText: '010',
+  }
+}
+
+export const entityCompletionItem = (entity: Entity): CompletionItem => {
+  const label = projectFQN(entity)
+  return {
+    label,
+    filterText: label,
+    insertTextFormat: InsertTextFormat.PlainText,
+    kind: match(entity)(
+      when(Class)(() => CompletionItemKind.Class),
+      when(Mixin)(() => CompletionItemKind.Interface),
+      when(Reference)(() => CompletionItemKind.Reference),
+      when(Singleton)(() => CompletionItemKind.Module),
+    ),
+    sortText: formatSortText(getLibraryIndex(entity)),
+  }
 }