Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-05-08 17:19:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix: handle null setting description ranges (#198877)

Browse Source
This commit is contained in:
Raymond Zhao
2023-11-22 10:34:32 -08:00
committed by GitHub
parent e33219dde3
commit dcd82219d6
1 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/vs/workbench/contrib/preferences/browser/preferencesSearch.ts
+11 -4
View File
@@ -20,6 +20,7 @@ import { InstantiationType, registerSingleton } from 'vs/platform/instantiation/
import { IAiRelatedInformationService, RelatedInformationType, SettingInformationResult } from 'vs/workbench/services/aiRelatedInformation/common/aiRelatedInformation';
import { TfIdfCalculator, TfIdfDocument } from 'vs/base/common/tfIdf';
import { IStringDictionary } from 'vs/base/common/collections';
import { nullRange } from 'vs/workbench/services/preferences/common/preferencesModels';
export interface IEndpointDetails {
urlBase?: string;
@@ -282,11 +283,17 @@ export class SettingMatches {
}
private toDescriptionRange(setting: ISetting, match: IMatch, lineIndex: number): IRange {
const descriptionRange = setting.descriptionRanges[lineIndex];
if (!descriptionRange) {
// This case occurs with added settings such as the
// manage extension setting.
return nullRange;
}
return {
startLineNumber: setting.descriptionRanges[lineIndex].startLineNumber,
startColumn: setting.descriptionRanges[lineIndex].startColumn + match.start,
endLineNumber: setting.descriptionRanges[lineIndex].endLineNumber,
endColumn: setting.descriptionRanges[lineIndex].startColumn + match.end
startLineNumber: descriptionRange.startLineNumber,
startColumn: descriptionRange.startColumn + match.start,
endLineNumber: descriptionRange.endLineNumber,
endColumn: descriptionRange.startColumn + match.end
};
}