Share Markdown source-range conversions

Task: 2026/10/29/share-markdown-source-range-conversions

Author: john-preston

Telegram/SourceFiles/iv/markdown/iv_markdown_math.cpp

@@ -212,30 +212,6 @@ void OffsetToPosition(
 	return cleaned;
 }
 
-[[nodiscard]] SourceRange RangeForOffsets(
-		const std::vector<int> &lineStarts,
-		int sourceSize,
-		int startOffset,
-		int endOffset) {
-	auto startLine = 0;
-	auto startColumn = 0;
-	auto endLine = 0;
-	auto endColumn = 0;
-	OffsetToPosition(lineStarts, startOffset, &startLine, &startColumn);
-	OffsetToPosition(
-		lineStarts,
-		std::max(startOffset, endOffset - 1),
-		&endLine,
-		&endColumn);
-	return RangeFromLineColumns(
-		lineStarts,
-		sourceSize,
-		startLine,
-		startColumn,
-		endLine,
-		endColumn);
-}
-
 [[nodiscard]] bool ExceedsFormulaBytes(
 		const QByteArray &content,
 		int maxFormulaBytes) {
@@ -294,6 +270,30 @@ SourceRange RangeFromLineColumns(
 	return result;
 }
 
+SourceRange RangeForOffsets(
+		const std::vector<int> &lineStarts,
+		int sourceSize,
+		int startOffset,
+		int endOffset) {
+	auto startLine = 0;
+	auto startColumn = 0;
+	auto endLine = 0;
+	auto endColumn = 0;
+	OffsetToPosition(lineStarts, startOffset, &startLine, &startColumn);
+	OffsetToPosition(
+		lineStarts,
+		std::max(startOffset, endOffset - 1),
+		&endLine,
+		&endColumn);
+	return RangeFromLineColumns(
+		lineStarts,
+		sourceSize,
+		startLine,
+		startColumn,
+		endLine,
+		endColumn);
+}
+
 bool ExtractMathRegions(
 		const QByteArray &source,
 		const std::vector<bool> &mask,

Telegram/SourceFiles/iv/markdown/iv_markdown_math.h

@@ -28,6 +28,11 @@ struct MathScanBlock {
 	int startColumn,
 	int endLine,
 	int endColumn);
+[[nodiscard]] SourceRange RangeForOffsets(
+	const std::vector<int> &lineStarts,
+	int sourceSize,
+	int startOffset,
+	int endOffset);
 [[nodiscard]] bool ExtractMathRegions(
 	const QByteArray &source,
 	const std::vector<bool> &mask,

Telegram/SourceFiles/iv/markdown/iv_markdown_parse_convert.cpp

@@ -101,42 +101,12 @@ void AddWarning(ParserState *state, QString warning) {
 	return raw.isEmpty() ? u"unknown"_q : raw;
 }
 
-[[nodiscard]] SourceRange RangeFromCmarkLines(
-		const std::vector<int> &lineStarts,
-		int sourceSize,
-		int startLine,
-		int startColumn,
-		int endLine,
-		int endColumn) {
-	auto result = SourceRange();
-	result.startLine = startLine;
-	result.startColumn = startColumn;
-	result.endLine = endLine;
-	result.endColumn = endColumn;
-	const auto linesCount = static_cast<int>(lineStarts.size());
-	if (startLine <= 0
-		|| endLine <= 0
-		|| startLine > linesCount
-		|| endLine > linesCount) {
-		return result;
-	}
-	const auto maxOffset = std::max(sourceSize, 0);
-	const auto startOffset = lineStarts[startLine - 1]
-		+ std::max(0, startColumn - 1);
-	const auto endOffset = lineStarts[endLine - 1]
-		+ std::max(0, endColumn);
-	result.available = true;
-	result.startOffset = std::clamp(startOffset, 0, maxOffset);
-	result.endOffset = std::clamp(endOffset, 0, maxOffset);
-	return result;
-}
-
 [[nodiscard]] SourceRange NodeRange(
 		cmark_node *node,
 		const std::vector<int> &lineStarts,
 		int sourceSize) {
 	return node
-		? RangeFromCmarkLines(
+		? RangeFromLineColumns(
 			lineStarts,
 			sourceSize,
 			cmark_node_get_start_line(node),

Telegram/SourceFiles/iv/markdown/iv_markdown_parse_finalize.cpp

@@ -17,33 +17,6 @@ For license and copyright information please follow this link:
 namespace Iv::Markdown {
 namespace {
 
-void OffsetToPosition(
-		const std::vector<int> &lineStarts,
-		int offset,
-		int *line,
-		int *column) {
-	const auto clampedOffset = std::max(offset, 0);
-	auto resultLine = 1;
-	auto resultColumn = clampedOffset + 1;
-	if (!lineStarts.empty()) {
-		auto i = std::upper_bound(
-			lineStarts.begin(),
-			lineStarts.end(),
-			clampedOffset);
-		if (i != lineStarts.begin()) {
-			--i;
-			resultLine = static_cast<int>(i - lineStarts.begin()) + 1;
-			resultColumn = clampedOffset - *i + 1;
-		}
-	}
-	if (line) {
-		*line = resultLine;
-	}
-	if (column) {
-		*column = resultColumn;
-	}
-}
-
 [[nodiscard]] QString SourceSlice(
 		const QByteArray &source,
 		const SourceRange &range) {
@@ -57,30 +30,6 @@ void OffsetToPosition(
 	return QString::fromUtf8(slice.constData(), slice.size());
 }
 
-[[nodiscard]] SourceRange RangeForOffsets(
-		const std::vector<int> &lineStarts,
-		int sourceSize,
-		int startOffset,
-		int endOffset) {
-	auto startLine = 0;
-	auto startColumn = 0;
-	auto endLine = 0;
-	auto endColumn = 0;
-	OffsetToPosition(lineStarts, startOffset, &startLine, &startColumn);
-	OffsetToPosition(
-		lineStarts,
-		std::max(startOffset, endOffset - 1),
-		&endLine,
-		&endColumn);
-	return RangeFromLineColumns(
-		lineStarts,
-		sourceSize,
-		startLine,
-		startColumn,
-		endLine,
-		endColumn);
-}
-
 [[nodiscard]] QString PlainText(const MarkdownNode &node) {
 	auto result = node.text;
 	for (const auto &child : node.children) {