diff --git a/client/out/languageserver.js b/client/out/languageserver.js
index 1dc08e9bd8b12c413156e64b4ba95e5edf296004..97fb14297843bb525ef6806f90b19e663e2aa584 100644
--- a/client/out/languageserver.js
+++ b/client/out/languageserver.js
@@ -119,7 +119,8 @@ function start(context, documentSelector, folder) {
     client.start();
     client.onReady().then(() => {
         onCommand(client);
-        onInlayHint(client);
+        onDecorations(client);
+        //onInlayHint(client);
         statusBar(client);
     });
     return client;
@@ -211,13 +212,14 @@ function onDecorations(client) {
                 let options = [];
                 for (let index = 0; index < edits.length; index++) {
                     const edit = edits[index];
+                    let pos = client.protocol2CodeConverter.asPosition(edit.pos);
                     options[index] = {
-                        hoverMessage: edit.newText,
-                        range: client.protocol2CodeConverter.asRange(edit.range),
+                        hoverMessage: edit.text,
+                        range: new vscode.Range(pos, pos),
                         renderOptions: {
                             light: {
                                 after: {
-                                    contentText: edit.newText,
+                                    contentText: edit.text,
                                     color: '#888888',
                                     backgroundColor: '#EEEEEE;border-radius: 5px;',
                                     fontWeight: '400; font-size: 12px; line-height: 1;',
@@ -225,7 +227,7 @@ function onDecorations(client) {
                             },
                             dark: {
                                 after: {
-                                    contentText: edit.newText,
+                                    contentText: edit.text,
                                     color: '#888888',
                                     backgroundColor: '#333333;border-radius: 5px;',
                                     fontWeight: '400; font-size: 12px; line-height: 1;',
diff --git a/client/src/languageserver.ts b/client/src/languageserver.ts
index 52dc8217b549907e4dbbf16def8ee8b92d42c713..a994354378279ba99d83374f6300608e1e1186db 100644
--- a/client/src/languageserver.ts
+++ b/client/src/languageserver.ts
@@ -24,6 +24,12 @@ import {
 let defaultClient: LanguageClient;
 let clients: Map<string, LanguageClient> = new Map();
 
+type HintResult = {
+    text: string,
+    pos:  types.Position,
+    kind: types.integer,
+}
+
 function registerCustomCommands(context: ExtensionContext) {
     context.subscriptions.push(Commands.registerCommand('lua.config', (changes) => {
         for (const data of changes) {
@@ -162,7 +168,8 @@ function start(context: ExtensionContext, documentSelector: DocumentSelector, fo
     client.start();
     client.onReady().then(() => {
         onCommand(client);
-        onInlayHint(client);
+        onDecorations(client)
+        //onInlayHint(client);
         statusBar(client);
     });
 
@@ -263,17 +270,18 @@ function onDecorations(client: LanguageClient) {
             const editor = window.visibleTextEditors[index];
             if (editor.document.uri.toString() == uri && isDocumentInClient(editor.document, client)) {
                 let textEditor = editor;
-                let edits:  types.TextEdit[] = params.edits
+                let edits: HintResult[] = params.edits
                 let options: vscode.DecorationOptions[] = [];
                 for (let index = 0; index < edits.length; index++) {
                     const edit = edits[index];
+                    let pos = client.protocol2CodeConverter.asPosition(edit.pos);
                     options[index] = {
-                        hoverMessage:  edit.newText,
-                        range:         client.protocol2CodeConverter.asRange(edit.range),
+                        hoverMessage:  edit.text,
+                        range:         new vscode.Range(pos, pos),
                         renderOptions: {
                             light: {
                                 after: {
-                                    contentText:     edit.newText,
+                                    contentText:     edit.text,
                                     color:           '#888888',
                                     backgroundColor: '#EEEEEE;border-radius: 5px;',
                                     fontWeight:      '400; font-size: 12px; line-height: 1;',
@@ -281,7 +289,7 @@ function onDecorations(client: LanguageClient) {
                             },
                             dark: {
                                 after: {
-                                    contentText:     edit.newText,
+                                    contentText:     edit.text,
                                     color:           '#888888',
                                     backgroundColor: '#333333;border-radius: 5px;',
                                     fontWeight:      '400; font-size: 12px; line-height: 1;',
@@ -297,11 +305,6 @@ function onDecorations(client: LanguageClient) {
 }
 
 function onInlayHint(client: LanguageClient) {
-    type HintResult = {
-        text: string,
-        pos:  types.Position,
-        kind: types.integer,
-    }
     vscode.languages.registerInlayHintsProvider(client.clientOptions.documentSelector, {
         provideInlayHints: async (model: TextDocument, range: vscode.Range): Promise<vscode.InlayHint[]> => {
             let pdoc    = client.code2ProtocolConverter.asTextDocumentIdentifier(model);
diff --git a/package/package.lua b/package/package.lua
index d9ba4ab8163fb6202fe92c5bb946d16889f5dc2c..f3dc14db7eda6357fccbd1e9711cb95d1e75d645 100644
--- a/package/package.lua
+++ b/package/package.lua
@@ -5,7 +5,6 @@ return {
     author = "sumneko",
     icon = "images/logo.png",
     license = "MIT",
-    enableProposedApi = true,
     repository = {
         type = "git",
         url = "https://github.com/sumneko/lua-language-server"