Fix input error in django and flask pickers (#292)

* fix input error * fix filter on windows * fix lint
microsoft · Mar 27, 2024 · 2a4a27b · 2a4a27b
1 parent 0b5edc2
commit 2a4a27b
Show file tree

Hide file tree

Showing 7 changed files with 36 additions and 37 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -73,10 +73,10 @@
         ],
         "menus": {
             "issue/reporter": [
-				{
-					"command": "debugpy.reportIssue"
-				}
-			],
+                {
+                    "command": "debugpy.reportIssue"
+                }
+            ],
             "commandPalette": [
                 {
                     "category": "Python Debugger",
@@ -525,7 +525,7 @@
         "format-check": "prettier --check 'src/**/*.ts' 'build/**/*.yml' '.github/**/*.yml'",
         "format-fix": "prettier --write 'src/**/*.ts' 'build/**/*.yml' '.github/**/*.yml'",
         "test": "node ./out/test/runTest.js",
-        "vsce-package": "vsce package -o python-debugger.vsix"
+        "vsce-package": "npx @vscode/vsce package -o python-debugger.vsix"
     },
     "devDependencies": {
         "@types/chai": "^4.3.4",
@@ -541,7 +541,7 @@
         "@typescript-eslint/eslint-plugin": "^5.31.0",
         "@typescript-eslint/parser": "^5.62.0",
         "@vscode/test-electron": "^2.3.9",
-        "@vscode/vsce": "^2.19.0",
+        "@vscode/vsce": "^2.24.0",
         "chai": "^4.3.7",
         "chai-as-promised": "^7.1.1",
         "eslint": "^8.50.0",

diff --git a/src/extension/common/multiStepInput.ts b/src/extension/common/multiStepInput.ts
@@ -214,6 +214,19 @@ export class MultiStepInput<S> implements IMultiStepInput<S> {
                     // eslint-disable-next-line @typescript-eslint/no-explicit-any
                     deferred.resolve(input.value as any);
                 }),
+                input.onDidChangeSelection((selectedItems) => {
+                    if (input.value) {
+                        deferred.resolve(input.value as any);
+                    } else {
+                        deferred.resolve(selectedItems[0]);
+                    }
+                }),
+            );
+        } else {
+            disposables.push(
+                input.onDidChangeSelection((selectedItems) => {
+                    deferred.resolve(selectedItems[0]);
+                }),
             );
         }
 

diff --git a/src/extension/debugger/configuration/providers/providerQuickPick/djangoProviderQuickPick.ts b/src/extension/debugger/configuration/providers/providerQuickPick/djangoProviderQuickPick.ts
@@ -30,7 +30,6 @@ export async function pickDjangoPrompt(
         placeholder: DebugConfigStrings.django.djangoConfigPromp.prompt,
         items: options,
         acceptFilterBoxTextAsSelection: true,
-        activeItem: options[0],
         matchOnDescription: true,
         title: DebugConfigStrings.django.djangoConfigPromp.title,
         onDidTriggerItemButton: async (e: QuickPickItemButtonEvent<QuickPickType>) => {

diff --git a/src/extension/debugger/configuration/providers/providerQuickPick/flaskProviderQuickPick.ts b/src/extension/debugger/configuration/providers/providerQuickPick/flaskProviderQuickPick.ts
@@ -28,7 +28,6 @@ export async function pickFlaskPrompt(
         placeholder: DebugConfigStrings.flask.flaskConfigPromp.prompt,
         items: options,
         acceptFilterBoxTextAsSelection: true,
-        activeItem: options[0],
         matchOnDescription: true,
         title: DebugConfigStrings.flask.flaskConfigPromp.title,
         onDidTriggerItemButton: async (e: QuickPickItemButtonEvent<QuickPickType>) => {

diff --git a/src/extension/debugger/configuration/providers/providerQuickPick/providerQuickPick.ts b/src/extension/debugger/configuration/providers/providerQuickPick/providerQuickPick.ts
@@ -16,11 +16,11 @@ export const browseFileOption = {
 };
 
 export async function openFileExplorer(folder: Uri | undefined) {
-    const filtersKey = 'Executables';
+    const filtersKey = 'Python Files';
     const filtersObject: { [name: string]: string[] } = {};
-    filtersObject[filtersKey] = ['exe'];
+    filtersObject[filtersKey] = ['py'];
     return await window.showOpenDialog({
-        filters: getOSType() == OSType.Windows ? filtersObject : undefined,
+        filters: getOSType() === OSType.Windows ? filtersObject : undefined,
         openLabel: DebugConfigStrings.browsePath.openButtonLabel,
         canSelectMany: false,
         title: DebugConfigStrings.browsePath.title,

diff --git a/tsconfig.json b/tsconfig.json
@@ -10,6 +10,9 @@
             "ES2020"
         ],
         "sourceMap": true,
+        "typeRoots": [
+            "./node_modules/@types"
+        ],
         "rootDir": "src",
         "strict": true, /* enable all strict type-checking options */
         "experimentalDecorators": true,