diff --git a/packages/language-service/lib/utils/common.ts b/packages/language-service/lib/utils/common.ts
index 92737719..b01e3c7a 100644
--- a/packages/language-service/lib/utils/common.ts
+++ b/packages/language-service/lib/utils/common.ts
@@ -32,14 +32,11 @@ export function findOverlapCodeRange(
 				const overlap = getOverlapRange(start, end, mappingStart, mappingEnd);
 				if (overlap) {
 					const curMappedStart = (overlap.start - mappingStart) + mapping.generatedOffsets[0];
-
-					mappedStart = mappedStart === undefined ? curMappedStart : Math.min(mappedStart, curMappedStart);
-
 					const lastGeneratedLength = (mapping.generatedLengths ?? mapping.lengths)[mapping.generatedOffsets.length - 1];
 					const curMappedEndOffset = Math.min(overlap.end - mapping.sourceOffsets[mapping.sourceOffsets.length - 1], lastGeneratedLength);
-
 					const curMappedEnd = mapping.generatedOffsets[mapping.generatedOffsets.length - 1] + curMappedEndOffset;
 
+					mappedStart = mappedStart === undefined ? curMappedStart : Math.min(mappedStart, curMappedStart);
 					mappedEnd = mappedEnd === undefined ? curMappedEnd : Math.max(mappedEnd, curMappedEnd);
 				}
 			}