Revert "extract parsing of commands and stems"

This reverts commit ddfd180.

src/utilities/codemirror/cdlDictionary.ts

@@ -65,32 +65,12 @@ export function parseCdlDictionary(contents: string, id?: string, path?: string)
     version,
   };
 
-  const { enums, fswCommands } = parseArgumentsAndStems(lineIterator);
-
-  return {
-    enumMap: Object.fromEntries(enums.map(e => [e.name, e])),
-    enums,
-    fswCommandMap: Object.fromEntries(fswCommands.map(cmd => [cmd.stem, cmd])),
-    fswCommands,
-    header,
-    hwCommandMap: {},
-    hwCommands: [],
-    id: id ?? '',
-    path: path ?? '',
-  };
-}
-
-function parseArgumentsAndStems(lineIterator: ArrayIterator<string>): {
-  enums: Enum[];
-  fswCommands: FswCommand[];
-} {
-  // parse globals and stems
-  // assumes all global arguments are defined prior to stems
-
   const enums: Enum[] = [];
+
   const globalArguments: FswCommandArgumentMap = {};
   const fswCommands: FswCommand[] = [];
-
+  // parse globals and stems
+  // assumes all global arguments are defined prior to stems
   for (const line of lineIterator) {
     if (line.match(START_LOOKUP_ARG)) {
       const lookupLines: string[] = [line];
@@ -129,9 +109,17 @@ function parseArgumentsAndStems(lineIterator: ArrayIterator<string>): {
       }
     }
   }
+
   return {
+    enumMap: Object.fromEntries(enums.map(e => [e.name, e])),
     enums,
+    fswCommandMap: Object.fromEntries(fswCommands.map(cmd => [cmd.stem, cmd])),
     fswCommands,
+    header,
+    hwCommandMap: {},
+    hwCommands: [],
+    id: id ?? '',
+    path: path ?? '',
   };
 }