From 249ec680ccb9f4d6593c0b439d892de672136790 Mon Sep 17 00:00:00 2001 From: rjmacarthy Date: Wed, 20 Mar 2024 14:29:10 +0000 Subject: [PATCH 1/5] fix clear valid and completion on new --- src/extension/providers/completion.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/extension/providers/completion.ts b/src/extension/providers/completion.ts index bfaec11f..25f5a26f 100644 --- a/src/extension/providers/completion.ts +++ b/src/extension/providers/completion.ts @@ -108,6 +108,8 @@ export class CompletionProvider implements InlineCompletionItemProvider { position: Position, context: InlineCompletionContext ): Promise { + this._completion = '' + this._validCompletion = '' const editor = window.activeTextEditor if ( getShouldSkipCompletion(context, this._disableAuto) || @@ -158,7 +160,6 @@ export class CompletionProvider implements InlineCompletionItemProvider { return new Promise((resolve, reject) => { this._debouncer = setTimeout(() => { this._lock.acquire('completion', () => { - this._completion = '' return new Promise( (_resolve: (completion: ResolvedInlineCompletion) => void) => { const { requestBody, requestOptions } = From 2b17ed37eec4814ddc906f032e06cd33ea80fbb8 Mon Sep 17 00:00:00 2001 From: rjmacarthy Date: Wed, 20 Mar 2024 14:29:52 +0000 Subject: [PATCH 2/5] fix launch.json revert --- .vscode/launch.json | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.vscode/launch.json b/.vscode/launch.json index f1741057..d7368add 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -11,13 +11,11 @@ "request": "launch", "runtimeExecutable": "${execPath}", "args": [ - "--user-data-dir=vscode-test", "--extensionDevelopmentPath=${workspaceFolder}", - "--disable-extensions", - "--profile-temp" + "${workspaceFolder}/example" ], "outFiles": ["${workspaceFolder}/out/**/*.js"], - "preLaunchTask": "npm: watch" + "preLaunchTask": "${defaultBuildTask}" }, { "name": "Extension Tests", From c90a0637f38e138518d48bf93cc0c37d852543ba Mon Sep 17 00:00:00 2001 From: rjmacarthy Date: Wed, 20 Mar 2024 14:33:41 +0000 Subject: [PATCH 3/5] remove : as declaration, more useful --- src/common/constants.ts | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/common/constants.ts b/src/common/constants.ts index 6b1a1631..31543210 100644 --- a/src/common/constants.ts +++ b/src/common/constants.ts @@ -18,7 +18,7 @@ export const BRACKET_REGEX = /^[()[\]{}]+$/ export const NORMALIZE_REGEX = /\s*\r?\n|\r/g export const LINE_BREAK_REGEX = /\r?\n|\r|\n/g export const MAX_CONTEXT_LINE_COUNT = 200 -export const SKIP_DECLARATION_SYMBOLS = ['=', ':'] +export const SKIP_DECLARATION_SYMBOLS = ['='] export const IMPORT_SEPARATOR = [',', '{'] export const SKIP_IMPORT_KEYWORDS_AFTER = ['from', 'as', 'import'] @@ -51,7 +51,8 @@ export const MESSAGE_NAME = { twinnyFetchOllamaModels: 'twinny-fetch-ollama-models', twinnySetOllamaModel: 'twinny-set-ollama-model', twinnySetConfigValue: 'twinny-set-config-value', - twinnyGetConfigValue: 'twinny-get-config-value' + twinnyGetConfigValue: 'twinny-get-config-value', + twinnyGetGitChanges: 'twinny-get-git-changes', } export const MESSAGE_KEY = { From dbea2bc3c65728be18419e2cd5f8a5e15504e18e Mon Sep 17 00:00:00 2001 From: rjmacarthy Date: Wed, 20 Mar 2024 14:40:10 +0000 Subject: [PATCH 4/5] revert --- src/common/constants.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/src/common/constants.ts b/src/common/constants.ts index 31543210..4c326ef8 100644 --- a/src/common/constants.ts +++ b/src/common/constants.ts @@ -52,7 +52,6 @@ export const MESSAGE_NAME = { twinnySetOllamaModel: 'twinny-set-ollama-model', twinnySetConfigValue: 'twinny-set-config-value', twinnyGetConfigValue: 'twinny-get-config-value', - twinnyGetGitChanges: 'twinny-get-git-changes', } export const MESSAGE_KEY = { From 114b86ca308d38c4c4df0bc55dfaba4642adb704 Mon Sep 17 00:00:00 2001 From: rjmacarthy Date: Wed, 20 Mar 2024 14:40:49 +0000 Subject: [PATCH 5/5] 3.8.5 --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 66665dcc..c58d0844 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "twinny", - "version": "3.8.4", + "version": "3.8.5", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "twinny", - "version": "3.8.4", + "version": "3.8.5", "hasInstallScript": true, "license": "MIT", "dependencies": { diff --git a/package.json b/package.json index 819d5e31..b1370b58 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "twinny", "displayName": "twinny - AI Code Completion and Chat", "description": "Locally hosted AI code completion plugin for vscode", - "version": "3.8.4", + "version": "3.8.5", "icon": "assets/icon.png", "keywords": [ "code-inference",