File tree Expand file tree Collapse file tree 1 file changed +13
-6
lines changed Expand file tree Collapse file tree 1 file changed +13
-6
lines changed Original file line number Diff line number Diff line change @@ -336,18 +336,21 @@ async function EditorManager($header, $body) {
336336 }
337337
338338 function createEmmetExtensionSet ( {
339- syntax = EmmetKnownSyntax . html ,
339+ syntax,
340340 tracker = { } ,
341341 config : emmetOverrides = { } ,
342342 } = { } ) {
343+ const resolvedSyntax =
344+ syntax === undefined ? EmmetKnownSyntax . html : syntax ;
345+ if ( ! resolvedSyntax ) return [ ] ;
343346 const trackerExtension = abbreviationTracker ( {
344- syntax,
347+ syntax : resolvedSyntax ,
345348 ...tracker ,
346349 } ) ;
347350 const { autocompleteTab = [ "markup" , "stylesheet" ] , ...restOverrides } =
348351 emmetOverrides || { } ;
349352 const emmetConfigExtension = emmetConfig . of ( {
350- syntax,
353+ syntax : resolvedSyntax ,
351354 autocompleteTab,
352355 ...restOverrides ,
353356 } ) ;
@@ -1022,10 +1025,14 @@ async function EditorManager($header, $body) {
10221025 if ( ext === "slim" || mode . includes ( "slim" ) ) return EmmetKnownSyntax . slim ;
10231026 if ( ext === "vue" || mode . includes ( "vue" ) ) return EmmetKnownSyntax . vue ;
10241027 if ( ext === "php" || mode . includes ( "php" ) ) return EmmetKnownSyntax . html ;
1025- if ( ext === "html" || ext === "xhtml" || mode . includes ( "html" ) )
1028+ if (
1029+ ext === "htm" ||
1030+ ext === "html" ||
1031+ ext === "xhtml" ||
1032+ mode . includes ( "html" )
1033+ )
10261034 return EmmetKnownSyntax . html ;
1027- // Defaults to html per Emmet docs
1028- return EmmetKnownSyntax . html ;
1035+ return null ;
10291036 }
10301037
10311038 const $vScrollbar = ScrollBar ( {
You can’t perform that action at this time.
0 commit comments