fix: stack overflow, update test cases

git-touch · Aug 21, 2019 · 1117023 · 1117023
1 parent 1a88ff6
commit 1117023
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 16 deletions.
diff --git a/highlight/lib/src/highlight.dart b/highlight/lib/src/highlight.dart
@@ -8,11 +8,10 @@ class Highlight {
   Map<String, Mode> _languages = {};
   Mode _languageMode;
 
-  factory Highlight() {
-    var hl = Highlight();
-    all.forEach(hl.registerLanguage);
-    return hl;
-  }
+  /// Create a syntax highlight instance
+  ///
+  /// Note that all languages are registered by default.
+  Highlight() : _languages = all;
 
   bool _classNameExists(String className) {
     return className != null && className.isNotEmpty;

diff --git a/highlight/test/highlight_test.dart b/highlight/test/highlight_test.dart
@@ -1,10 +1,11 @@
 import 'dart:io';
 import 'package:path/path.dart' as path;
 import 'package:highlight/highlight.dart';
-import 'package:highlight/languages/all.dart';
 import 'package:test/test.dart';
 
 void main() {
+  var hl = Highlight();
+
   group('markup', () {
     Directory('test/markup').listSync().forEach((entity) {
       var lang = path.basename(entity.path);
@@ -20,11 +21,8 @@ void main() {
                     .readAsStringSync()
                     .trim();
 
-            var h = Highlight();
-            all.forEach(h.registerLanguage);
-
-            var highlighted = h.highlight(code, language: lang);
-            expect(highlighted.toHtml().trim(), expected);
+            var actual = hl.highlight(code, language: lang).toHtml().trim();
+            expect(actual, expected);
           });
         });
       });
@@ -39,11 +37,7 @@ void main() {
         Directory('test/detect/$lang').listSync().forEach((entity) {
           test(path.basename(entity.path), () {
             var code = File(entity.path).readAsStringSync();
-
-            var h = Highlight();
-            all.forEach(h.registerLanguage);
-
-            expect(lang, h.highlight(code, language: lang).language);
+            expect(lang, hl.highlight(code, language: lang).language);
           });
         });
       });