work on more fenced code block complications

extensions/markdown-language-features/src/features/smartSelect.ts

@@ -179,18 +179,38 @@ function createBlockRange(document: vscode.TextDocument, block?: Token, parent?:
 }
 
 function createFencedRange(token: Token, document: vscode.TextDocument, parent?: vscode.SelectionRange): vscode.SelectionRange {
-	let blockRange = new vscode.SelectionRange(new vscode.Range(new vscode.Position(token.map[0], 0), new vscode.Position(token.map[1], getEndCharacter(document, token.map[0], token.map[1]))));
-	let childRange = new vscode.Range(new vscode.Position(token.map[0] + 1, 0), new vscode.Position(token.map[1] - 1, getEndCharacter(document, token.map[0] + 1, token.map[1] - 1)));
-	if (parent && parent.range.contains(blockRange.range) && !parent.range.isEqual(blockRange.range)) {
-		return new vscode.SelectionRange(childRange, new vscode.SelectionRange(blockRange.range, parent));
-	} else if (parent?.range.isEqual(blockRange.range)) {
-		return new vscode.SelectionRange(childRange, parent);
-	} else if (parent?.parent?.range.contains(blockRange.range)) {
-		blockRange.parent = parent.parent;
-		return new vscode.SelectionRange(childRange, blockRange);
-	} else {
-		return new vscode.SelectionRange(childRange, blockRange);
+	const startLine = token.map[0];
+	const endLine = token.map[1] - 1;
+	let fenceRange = new vscode.Range(new vscode.Position(startLine, 0), new vscode.Position(endLine, document.lineAt(endLine).text.length));
+	let contentRange = endLine - startLine > 2 ? new vscode.Range(new vscode.Position(startLine + 1, 0), new vscode.Position(endLine - 1, getEndCharacter(document, startLine + 1, endLine))) : undefined;
+	if (parent && contentRange) {
+		if (parent.range.contains(fenceRange) && !parent.range.isEqual(fenceRange)) {
+			return new vscode.SelectionRange(contentRange, new vscode.SelectionRange(fenceRange, parent));
+		} else if (parent.range.isEqual(fenceRange)) {
+			return new vscode.SelectionRange(contentRange, parent);
+		} else if (rangeLinesEqual(fenceRange, parent.range)) {
+			let revisedRange = fenceRange.end.character > parent.range.end.character ? fenceRange : parent.range;
+			return new vscode.SelectionRange(contentRange, new vscode.SelectionRange(revisedRange, getRealParent(parent, revisedRange)));
+		} else if (parent.range.end.line === fenceRange.end.line) {
+			parent.range.end.translate(undefined, fenceRange.end.character);
+			return new vscode.SelectionRange(contentRange, new vscode.SelectionRange(fenceRange, parent));
+		}
+	} else if (contentRange) {
+		return new vscode.SelectionRange(contentRange, new vscode.SelectionRange(fenceRange));
+	} else if (parent) {
+		if (parent.range.contains(fenceRange) && !parent.range.isEqual(fenceRange)) {
+			return new vscode.SelectionRange(fenceRange, parent);
+		} else if (parent.range.isEqual(fenceRange)) {
+			return parent;
+		} else if (rangeLinesEqual(fenceRange, parent.range)) {
+			let revisedRange = fenceRange.end.character > parent.range.end.character ? fenceRange : parent.range;
+			return new vscode.SelectionRange(revisedRange, parent.parent);
+		} else if (parent.range.end.line === fenceRange.end.line) {
+			parent.range.end.translate(undefined, fenceRange.end.character);
+			return new vscode.SelectionRange(fenceRange, parent);
+		}
 	}
+	return new vscode.SelectionRange(fenceRange, parent);
 }
 
 function isList(type: string): boolean {
@@ -204,6 +224,14 @@ function getEndCharacter(document: vscode.TextDocument, startLine: number, endLi
 	return startLine !== endLine ? 0 : endChar;
 }
 
+function getRealParent(parent: vscode.SelectionRange, range: vscode.Range) {
+	let currentParent: vscode.SelectionRange | undefined = parent;
+	while (currentParent && !currentParent.range.contains(range)) {
+		currentParent = currentParent.parent;
+	}
+	return currentParent;
+}
+
 function rangeLinesEqual(range: vscode.Range, parent: vscode.Range) {
 	return range.start.line === parent.start.line && range.end.line === parent.end.line;
 }

extensions/markdown-language-features/src/test/smartSelect.test.ts

@@ -78,7 +78,7 @@ suite.only('markdown.SmartSelect', () => {
 				`a${CURSOR}`,
 				`~~~`));
 
-		assertNestedRangesEqual(ranges![0], [1, 2], [0, 3]);
+		assertNestedRangesEqual(ranges![0], [0, 2]);
 	});
 	test('Smart select list', async () => {
 		const ranges = await getSelectionRangesForDocument(
@@ -100,7 +100,7 @@ suite.only('markdown.SmartSelect', () => {
 				`- item 3`,
 				`- item 4`));
 
-		assertNestedRangesEqual(ranges![0], [2, 3], [1, 4], [0, 5]);
+		assertNestedRangesEqual(ranges![0], [1, 3], [0, 5]);
 	});
 	test('Smart select multi cursor', async () => {
 		const ranges = await getSelectionRangesForDocument(
@@ -196,7 +196,7 @@ suite.only('markdown.SmartSelect', () => {
 				`more content`,
 				`# main header 2`));
 
-		assertNestedRangesEqual(ranges![0], [5, 6], [4, 7], [3, 9], [3, 10], [2, 10], [1, 10], [0, 10]);
+		assertNestedRangesEqual(ranges![0], [4, 6], [3, 9], [3, 10], [2, 10], [1, 10], [0, 10]);
 	});
 	test('Smart select list with one element without selecting child subheader', async () => {
 		const ranges = await getSelectionRangesForDocument(
@@ -316,6 +316,30 @@ suite.only('markdown.SmartSelect', () => {
 
 		assertNestedRangesEqual(ranges![0], [16, 17], [14, 17], [14, 17], [13, 17], [9, 17], [8, 17], [1, 17], [0, 17]);
 	});
+	test('Smart select fenced code block then list then rest of content', async () => {
+		const ranges = await getSelectionRangesForDocument(
+			joinLines(
+				`# main header 1`,
+				``,
+				`> block`,
+				`> block`,
+				`>> block`,
+				`>> block`,
+				``,
+				`- paragraph`,
+				`- ~~~`,
+				`  my`,
+				`  ${CURSOR}code`,
+				`  goes here`,
+				`  ~~~`,
+				`- content`,
+				`- content 2`,
+				`- content 2`,
+				`- content 2`,
+				`- content 2`));
+
+		assertNestedRangesEqual(ranges![0], [9, 11], [8, 12], [7, 17], [1, 17], [0, 17]);
+	});
 });
 
 function assertNestedRangesEqual(range: vscode.SelectionRange, ...expectedRanges: [number, number][]) {