Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-05-02 06:21:50 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix a few more emmet errors for strict null

Browse Source
This commit is contained in:
Matt Bierner
2017-11-20 14:29:29 -08:00
parent 336e9cebf5
commit 86999bb82b
8 changed files with 40 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
extensions/emmet/src/abbreviationActions.ts
View File

@@ -88,9 +88,9 @@ export function wrapIndividualLinesWithAbbreviation(args: any) {
}
export function expandEmmetAbbreviation(args: any): Thenable<boolean> {
export function expandEmmetAbbreviation(args: any): Thenable<boolean | undefined> | undefined {
const syntax = getSyntaxFromArgs(args);
if (!syntax || !validate()) {
if (!syntax || !validate() || !vscode.window.activeTextEditor) {
return fallbackTab();
}
@@ -108,7 +108,7 @@ export function expandEmmetAbbreviation(args: any): Thenable<boolean> {
let allAbbreviationsSame: boolean = true;
const helper = getEmmetHelper();
let getAbbreviation = (document: vscode.TextDocument, selection: vscode.Selection, position: vscode.Position, syntax: string): [vscode.Range, string, string] => {
let getAbbreviation = (document: vscode.TextDocument, selection: vscode.Selection, position: vscode.Position, syntax: string): [vscode.Range | null, string, string] => {
let rangeToReplace: vscode.Range = selection;
let abbr = document.getText(rangeToReplace);
if (!rangeToReplace.isEmpty) {