Merge branch 'tweak_remove_command'

tamuratak · Oct 1, 2023 · 6ea6d56 · 6ea6d56
2 parents 630811b + e3b67c5
commit 6ea6d56
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 9 deletions.
diff --git a/src/providers/completionlib/commandremover.ts b/src/providers/completionlib/commandremover.ts
@@ -4,7 +4,7 @@ import { findNodeContactedWithPosition, toLuPos } from '../../utils/utensils'
 import { IContexAwareProvider } from './interface'
 import { toVscodePosition } from '../../utils/utensils'
 import { toVscodeRange } from '../../utils/utensils'
-import { isPositionAtTerminator } from './utils/position'
+import { isPositionAtClosingBrace } from './utils/position'
 import { ContextAwareKind } from './completionkind'
 
 
@@ -15,8 +15,7 @@ export class CommandRemover implements IContexAwareProvider {
         if (context.triggerKind === vscode.CompletionTriggerKind.TriggerCharacter) {
             return false
         }
-        const wordRange = document.getWordRangeAtPosition(position, /\\[a-zA-Z]+\{/)
-        if (wordRange || isPositionAtTerminator(document, position)) {
+        if (isPositionAtClosingBrace(document, position)) {
             return true
         } else {
             return false

diff --git a/src/providers/completionlib/utils/position.ts b/src/providers/completionlib/utils/position.ts
@@ -1,11 +1,6 @@
 import * as vscode from 'vscode'
 
-export function isPositionAtTerminator(document: vscode.TextDocument, position: vscode.Position): boolean {
-    const posRange = new vscode.Range(position, position.translate(0, 1))
-    const char = document.getText(posRange)
-    if (char === '\\' || char === '{') {
-        return true
-    }
+export function isPositionAtClosingBrace(document: vscode.TextDocument, position: vscode.Position): boolean {
     const prevChar = getPrevChar(document, position)
     if (prevChar === '}') {
         return true