Rename config option to say "default"

Author: shati-patel

extensions/ql-vscode/CHANGELOG.md

@@ -2,7 +2,7 @@
 
 ## [UNRELEASED]
 
-- Add settings `codeQL.variantAnalysis.filterResults` and `codeQL.variantAnalysis.sortResults` for configuring how variant analysis results are filtered and sorted in the results view. The default is to show only repositories with results, and to sort by the number of results. [#2392](https://github.com/github/vscode-codeql/pull/2392)
+- Add settings `codeQL.variantAnalysis.defaultResultsFilter` and `codeQL.variantAnalysis.defaultResultsSort` for configuring how variant analysis results are filtered and sorted in the results view. The default is to show only repositories with results, and to sort by the number of results. [#2392](https://github.com/github/vscode-codeql/pull/2392)
 - On the variant analysis results page, show the count of successful analyses instead of completed analyses, and indicate the reason why analyses were not successful. [#2349](https://github.com/github/vscode-codeql/pull/2349)
 - Fix bug where the "CodeQL: Set Current Database" command didn't always select the database. [#2384](https://github.com/github/vscode-codeql/pull/2384)
 

extensions/ql-vscode/package.json

@@ -329,7 +329,7 @@
           "patternErrorMessage": "Please enter a valid GitHub repository",
           "markdownDescription": "[For internal use only] The name of the GitHub repository in which the GitHub Actions workflow is run when using the \"Run Variant Analysis\" command. The repository should be of the form `<owner>/<repo>`)."
         },
-        "codeQL.variantAnalysis.filterResults": {
+        "codeQL.variantAnalysis.defaultResultsFilter": {
           "type": "string",
           "default": "withResults",
           "enum": [
@@ -340,9 +340,9 @@
             "Show all repositories in the results view.",
             "Show only repositories with results in the results view."
           ],
-          "description": "The filter to apply to the variant analysis results view."
+          "description": "The default filter to apply to the variant analysis results view."
         },
-        "codeQL.variantAnalysis.sortResults": {
+        "codeQL.variantAnalysis.defaultResultsSort": {
           "type": "string",
           "default": "numberOfResults",
           "enum": [

extensions/ql-vscode/src/config.ts

@@ -535,11 +535,11 @@ export class VariantAnalysisConfigListener
 }
 
 const VARIANT_ANALYSIS_FILTER_RESULTS = new Setting(
-  "filterResults",
+  "defaultResultsFilter",
   VARIANT_ANALYSIS_SETTING,
 );
 
-export function getVariantAnalysisFilterResults(): FilterKey {
+export function getVariantAnalysisDefaultResultsFilter(): FilterKey {
   const value = VARIANT_ANALYSIS_FILTER_RESULTS.getValue<string>();
   if (Object.values(FilterKey).includes(value as FilterKey)) {
     return value as FilterKey;
@@ -549,11 +549,11 @@ export function getVariantAnalysisFilterResults(): FilterKey {
 }
 
 const VARIANT_ANALYSIS_SORT_RESULTS = new Setting(
-  "sortResults",
+  "defaultResultsSort",
   VARIANT_ANALYSIS_SETTING,
 );
 
-export function getVariantAnalysisSortResults(): SortKey {
+export function getVariantAnalysisDefaultResultsSort(): SortKey {
   const value = VARIANT_ANALYSIS_SORT_RESULTS.getValue<string>();
   if (Object.values(SortKey).includes(value as SortKey)) {
     return value as SortKey;

extensions/ql-vscode/src/variant-analysis/variant-analysis-view.ts

@@ -28,8 +28,8 @@ import { DataFlowPathsView } from "./data-flow-paths-view";
 import { DataFlowPaths } from "./shared/data-flow-paths";
 import { App } from "../common/app";
 import {
-  getVariantAnalysisFilterResults,
-  getVariantAnalysisSortResults,
+  getVariantAnalysisDefaultResultsFilter,
+  getVariantAnalysisDefaultResultsSort,
 } from "../config";
 
 export class VariantAnalysisView
@@ -192,8 +192,8 @@ export class VariantAnalysisView
 
     const filterSortState = {
       searchValue: "",
-      filterKey: getVariantAnalysisFilterResults(),
-      sortKey: getVariantAnalysisSortResults(),
+      filterKey: getVariantAnalysisDefaultResultsFilter(),
+      sortKey: getVariantAnalysisDefaultResultsSort(),
     };
 
     await this.postMessage({