From 4d7ba5255cdb655a2a5b8a9e6f60d5d17c76b431 Mon Sep 17 00:00:00 2001 From: karan Date: Wed, 21 Nov 2018 22:19:44 +0530 Subject: [PATCH] fix: fixed issue with strict null check --- src/vs/editor/contrib/snippet/snippetVariables.ts | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/vs/editor/contrib/snippet/snippetVariables.ts b/src/vs/editor/contrib/snippet/snippetVariables.ts index 5ed841af65a..92b27d62f60 100644 --- a/src/vs/editor/contrib/snippet/snippetVariables.ts +++ b/src/vs/editor/contrib/snippet/snippetVariables.ts @@ -193,14 +193,16 @@ export class CommentBasedVariableResolver implements VariableResolver { resolve(variable: Variable): string | undefined { const { name } = variable; const language = this._model.getLanguageIdentifier(); - const comments = LanguageConfigurationRegistry.getComments(language.id); - + const config = LanguageConfigurationRegistry.getComments(language.id); + if (!config) { + return undefined; + } if (name === 'LINE_COMMENT') { - return comments.lineCommentToken || undefined; + return config.lineCommentToken || undefined; } else if (name === 'BLOCK_COMMENT_START') { - return comments.blockCommentStartToken || undefined; + return config.blockCommentStartToken || undefined; } else if (name === 'BLOCK_COMMENT_END') { - return comments.blockCommentEndToken || undefined; + return config.blockCommentEndToken || undefined; } return undefined; } -- GitLab