When commenting, use the language after the line start, not before

marijnh · marijnh · commit c55e0bed2bbc · 2025-03-29T08:26:25.000+01:00
FIX: Fix an issue where creating a comment for a line that starts an inner language would use the comment style from the outer language. Closes codemirror/dev#1544
diff --git a/src/comment.ts b/src/comment.ts
@@ -61,7 +61,7 @@ export const toggleBlockCommentByLine =
   command((o, s) => changeBlockComment(o, s, selectedLineRanges(s)), CommentOption.Toggle)
 
 function getConfig(state: EditorState, pos: number) {
-  let data = state.languageDataAt<CommentTokens>("commentTokens", pos)
+  let data = state.languageDataAt<CommentTokens>("commentTokens", pos, 1)
   return data.length ? data[0] : {}
 }
 

Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,7 @@ export const toggleBlockCommentByLine =`
`61`	`61`	`command((o, s) => changeBlockComment(o, s, selectedLineRanges(s)), CommentOption.Toggle)`
`62`	`62`
`63`	`63`	`function getConfig(state: EditorState, pos: number) {`
`64`		`- let data = state.languageDataAt<CommentTokens>("commentTokens", pos)`
	`64`	`+ let data = state.languageDataAt<CommentTokens>("commentTokens", pos, 1)`
`65`	`65`	`return data.length ? data[0] : {}`
`66`	`66`	`}`
`67`	`67`