return keyword: also remove trailing space after enter

Author: zardoy

package.json

@@ -74,7 +74,7 @@
         "@vscode/emmet-helper": "^2.8.4",
         "@vscode/test-electron": "^2.1.5",
         "@zardoy/utils": "^0.0.9",
-        "@zardoy/vscode-utils": "^0.0.45",
+        "@zardoy/vscode-utils": "^0.0.46",
         "chai": "^4.3.6",
         "chokidar": "^3.5.3",
         "chokidar-cli": "^3.0.0",
@@ -93,6 +93,7 @@
         "require-from-string": "^2.0.2",
         "string-dedent": "^3.0.1",
         "ts-expose-internals": "^4.8.4",
+        "ts-simple-type": "^1.0.7",
         "unleashed-typescript": "^1.3.0",
         "vscode-framework": "^0.0.18",
         "vscode-uri": "^3.0.6"

pnpm-lock.yaml

@@ -1,7 +1,8 @@
 import * as vscode from 'vscode'
 import { getActiveRegularEditor } from '@zardoy/vscode-utils'
-import { watchExtensionSettings } from '@zardoy/vscode-utils/build/settings'
-import { getExtensionSetting, Settings } from 'vscode-framework'
+import { conditionallyRegister } from '@zardoy/vscode-utils/build/settings'
+import { expandPosition } from '@zardoy/vscode-utils/build/position'
+import { getExtensionSetting } from 'vscode-framework'
 import { oneOf } from '@zardoy/utils'
 
 export default (tsApi: { onCompletionAccepted }) => {
@@ -61,38 +62,24 @@ export default (tsApi: { onCompletionAccepted }) => {
                         return
                     }
 
-                    if (char === ';') {
-                        void vscode.window.activeTextEditor.edit(builder => {
-                            for (const { range } of contentChanges) {
-                                const pos = range.start
-                                builder.delete(new vscode.Range(pos.translate(0, -1), pos))
-                            }
-                        })
+                    if (char === ';' || char === '\n') {
+                        void vscode.window.activeTextEditor.edit(
+                            builder => {
+                                for (const { range } of contentChanges) {
+                                    const pos = range.start
+                                    builder.delete(expandPosition(document, pos, -1))
+                                }
+                            },
+                            {
+                                undoStopAfter: false,
+                                undoStopBefore: false,
+                            },
+                        )
                     }
                 } finally {
                     justAcceptedReturnKeywordSuggestion = false
                 }
             }),
-        val => val !== 'none',
+        () => getExtensionSetting('suggestions.keywordsInsertText') !== 'none',
     )
 }
-
-const conditionallyRegister = <T extends keyof Settings>(
-    settingKey: T,
-    registerFn: () => vscode.Disposable,
-    acceptSettingValue: (val: Settings[T]) => boolean = val => !!val,
-) => {
-    let disposable: vscode.Disposable | undefined
-    const changeRegisterState = () => {
-        const registerState = acceptSettingValue(getExtensionSetting(settingKey))
-        if (registerState) {
-            if (!disposable) disposable = registerFn()
-        } else {
-            disposable?.dispose()
-            disposable = undefined
-        }
-    }
-
-    changeRegisterState()
-    watchExtensionSettings([settingKey], changeRegisterState)
-}