fix(assignments-service): Find end of python function with no newline…

… at EOF
fujaba · Sep 18, 2023 · 7a9d638 · 7a9d638
1 parent df22541
commit 7a9d638
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/services/apps/assignments/src/embedding/embedding.service.spec.ts b/services/apps/assignments/src/embedding/embedding.service.spec.ts
@@ -116,6 +116,6 @@ def baz():
 
     expect(findIndentEnd(code, 0, 10)).toEqual(34);
     expect(findIndentEnd(code, 35, 45)).toEqual(52);
-    // TODO test with no newline at end of file
+    expect(findIndentEnd(code.trim(), 35, 45)).toEqual(51);
   });
 });
diff --git a/services/apps/assignments/src/embedding/embedding.service.ts b/services/apps/assignments/src/embedding/embedding.service.ts
@@ -254,7 +254,10 @@ export function findIndentEnd(code: string, headStart: number, headEnd: number):
   const bodyIndent = code.substring(firstLineStart, bodyIndentEnd);
   let currentIndex = firstLineStart;
   while (true) {
-    const nextLineIndex = (code.indexOf('\n', currentIndex)) || code.length;
+    const nextLineIndex = code.indexOf('\n', currentIndex);
+    if (nextLineIndex === -1) {
+      return code.length - 1;
+    }
     if (currentIndex === nextLineIndex) { // line is empty
       currentIndex++;
       continue;