Skip to content

fix(types): guard the is judgement #814

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dbaeumer merged 1 commit into from
Oct 19, 2021
Merged

fix(types): guard the is judgement #814

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions types/src/main.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -297,7 +297,7 @@ export namespace Color {
*/
export function is(value: any): value is Color {
const candidate = value as Color;
return Is.numberRange(candidate.red, 0, 1)
return Is.objectLiteral(candidate) && Is.numberRange(candidate.red, 0, 1)
&& Is.numberRange(candidate.green, 0, 1)
&& Is.numberRange(candidate.blue, 0, 1)
&& Is.numberRange(candidate.alpha, 0, 1);
Expand Down Expand Up @@ -340,7 +340,7 @@ export namespace ColorInformation {
*/
export function is(value: any): value is ColorInformation {
const candidate = value as ColorInformation;
return Range.is(candidate.range) && Color.is(candidate.color);
return Is.objectLiteral(candidate) && Range.is(candidate.range) && Color.is(candidate.color);
}
}

Expand Down Expand Up @@ -385,7 +385,7 @@ export namespace ColorPresentation {
*/
export function is(value: any): value is ColorPresentation {
const candidate = value as ColorPresentation;
return Is.string(candidate.label)
return Is.objectLiteral(candidate) && Is.string(candidate.label)
&& (Is.undefined(candidate.textEdit) || TextEdit.is(candidate))
&& (Is.undefined(candidate.additionalTextEdits) || Is.typedArray(candidate.additionalTextEdits, TextEdit.is));
}
Expand Down Expand Up @@ -475,7 +475,7 @@ export namespace FoldingRange {
*/
export function is(value: any): value is FoldingRange {
const candidate = value as FoldingRange;
return Is.uinteger(candidate.startLine) && Is.uinteger(candidate.startLine)
return Is.objectLiteral(candidate) && Is.uinteger(candidate.startLine) && Is.uinteger(candidate.startLine)
&& (Is.undefined(candidate.startCharacter) || Is.uinteger(candidate.startCharacter))
&& (Is.undefined(candidate.endCharacter) || Is.uinteger(candidate.endCharacter))
&& (Is.undefined(candidate.kind) || Is.string(candidate.kind));
Expand Down Expand Up @@ -591,9 +591,9 @@ export interface CodeDescription {
* @since 3.16.0
*/
export namespace CodeDescription {
export function is(value: CodeDescription | undefined | null): value is CodeDescription {
export function is(value: any): value is CodeDescription {
const candidate: CodeDescription = value as CodeDescription;
return candidate !== undefined && candidate !== null && Is.string(candidate.href);
return Is.objectLiteral(candidate) && Is.string(candidate.href);
}
}

Expand Down Expand Up @@ -840,7 +840,7 @@ export namespace ChangeAnnotation {
}
export function is(value: any): value is ChangeAnnotation {
const candidate = value as ChangeAnnotation;
return candidate !== undefined && Is.objectLiteral(candidate) && Is.string(candidate.label) &&
return Is.objectLiteral(candidate) && Is.string(candidate.label) &&
(Is.boolean(candidate.needsConfirmation) || candidate.needsConfirmation === undefined) &&
(Is.string(candidate.description) || candidate.description === undefined);
}
Expand All @@ -849,7 +849,7 @@ export namespace ChangeAnnotation {
export namespace ChangeAnnotationIdentifier {
export function is(value: any): value is ChangeAnnotationIdentifier {
const candidate = value as ChangeAnnotationIdentifier;
return typeof candidate === 'string';
return Is.string(candidate);
}
}

Expand Down Expand Up @@ -3202,7 +3202,7 @@ export namespace SelectionRange {

export function is(value: any): value is SelectionRange {
let candidate = value as SelectionRange;
return candidate !== undefined && Range.is(candidate.range) && (candidate.parent === undefined || SelectionRange.is(candidate.parent));
return Is.objectLiteral(candidate) && Range.is(candidate.range) && (candidate.parent === undefined || SelectionRange.is(candidate.parent));
}
}

Expand Down Expand Up @@ -3390,7 +3390,7 @@ export interface SemanticTokens {
export namespace SemanticTokens {
export function is(value: any): value is SemanticTokens {
const candidate = value as SemanticTokens;
return candidate !== undefined && (candidate.resultId === undefined || typeof candidate.resultId === 'string') &&
return Is.objectLiteral(candidate) && (candidate.resultId === undefined || typeof candidate.resultId === 'string') &&
Array.isArray(candidate.data) && (candidate.data.length === 0 || typeof candidate.data[0] === 'number');
}
}
Expand Down