Test coverage for the FileType classes

src/common/all_test.ts

@@ -2,12 +2,13 @@ import Ansi, * as _Ansi from './ansi.ts';
 import Buffer from './buffer.ts';
 import Document from './document.ts';
 import Editor from './editor.ts';
-import { FileLang, FileType } from './filetype/mod.ts';
+import { FileLang } from './filetype/mod.ts';
 import { highlightToColor, HighlightType } from './highlight.ts';
 import Option, { None, Some } from './option.ts';
 import Position from './position.ts';
 import Row from './row.ts';
 
+import FileType, * as FT from './filetype/mod.ts';
 import * as Fn from './fns.ts';
 import { defaultTerminalSize, SCROLL_TAB_SIZE } from './config.ts';
 import { getTestRunner } from './runtime/mod.ts';
@@ -472,6 +473,19 @@ const EditorTest = {
 
 // ----------------------------------------------------------------------------
 
+const FileTypeTest = {
+	'FileType.from()': () => {
+		for (const [ext, typeClass] of FT.fileTypeMap.entries()) {
+			const file = `test${ext}`;
+			const syntax = FileType.from(file);
+
+			assertInstanceOf(syntax, typeClass);
+		}
+	},
+};
+
+// ----------------------------------------------------------------------------
+
 const OptionTest = {
 	'Option.from()': () => {
 		assertNone(Option.from(null));
@@ -633,6 +647,7 @@ testSuite({
 	Buffer: BufferTest,
 	Document: DocumentTest,
 	Editor: EditorTest,
+	FileType: FileTypeTest,
 	Option: OptionTest,
 	Position: PositionTest,
 	Row: RowTest,

src/common/filetype/base.ts

@@ -76,8 +76,7 @@ export abstract class AbstractFileType implements IFileType {
 	}
 
 	public hasMultilineComments(): boolean {
-		return this.multiLineCommentStart.isSome() &&
+		return this.multiLineCommentStart.and(this.multiLineCommentEnd).isSome();
-			this.multiLineCommentEnd.isSome();
 	}
 }
 

src/common/filetype/filetype.ts

@@ -9,8 +9,7 @@ import { ShellFile } from './shell.ts';
 // External interface
 // ----------------------------------------------------------------------------
 
-export class FileType extends AbstractFileType {
+export const fileTypeMap = new Map([
-	static #fileTypeMap = new Map([
 	['.c', CFile],
 	['.h', CFile],
 	['.css', CSSFile],
@@ -24,14 +23,17 @@ export class FileType extends AbstractFileType {
 	['.tsx', TypeScriptFile],
 ]);
 
+export class FileType extends AbstractFileType {
 	public static default(): FileType {
 		return new FileType();
 	}
 
 	public static from(filename: string): FileType {
 		const ext = path.extname(filename);
-		const type = FileType.#fileTypeMap.get(ext) ?? FileType;
+		const type = fileTypeMap.get(ext) ?? FileType;
 
 		return new type();
 	}
 }
+
+export default FileType;

src/common/filetype/mod.ts

@@ -1,2 +1,5 @@
 export * from './base.ts';
 export * from './filetype.ts';
+
+import FileType from './filetype.ts';
+export default FileType;