From 4caa9d674681f8b9e059ad775067802432ef5b19 Mon Sep 17 00:00:00 2001
From: tkadziolka <tmax0135@gmail.com>
Date: Wed, 27 Nov 2024 12:58:31 +0100
Subject: [PATCH 1/8] Implemented background isolate processing

---
 .../highlights_plugin/HighlightsPlugin.kt     | 53 ++++++++-----------
 example/lib/main.dart                         | 12 ++---
 lib/highlights_interface.dart                 |  2 +-
 lib/highlights_plugin.dart                    |  8 +--
 lib/highlights_plugin_method_channel.dart     | 42 ++++++++-------
 lib/highlights_plugin_platform_interface.dart |  2 +-
 6 files changed, 55 insertions(+), 64 deletions(-)

diff --git a/android/src/main/kotlin/dev/snipme/highlights_plugin/HighlightsPlugin.kt b/android/src/main/kotlin/dev/snipme/highlights_plugin/HighlightsPlugin.kt
index 848a7d9..7ee20c9 100644
--- a/android/src/main/kotlin/dev/snipme/highlights_plugin/HighlightsPlugin.kt
+++ b/android/src/main/kotlin/dev/snipme/highlights_plugin/HighlightsPlugin.kt
@@ -31,40 +31,33 @@ class HighlightsPlugin : FlutterPlugin, MethodCallHandler {
     }
 
     override fun onMethodCall(call: MethodCall, result: Result) {
-        when (call.method) {
-            "getHighlights" -> {
-                updateInstance(
-                    code = call.argument("code"),
-                    language = SyntaxLanguage.getByName(call.argument("language") ?: ""),
-                    theme = SyntaxThemes.getByName(call.argument("theme") ?: "", useDarkMode),
-                    emphasisLocations = tryGetEmphasisFromJson(call.argument("emphasisLocations"))
-                )
+        try {
+            when (call.method) {
+                "getHighlights" -> {
+                    updateInstance(
+                        code = call.argument("code"),
+                        language = SyntaxLanguage.getByName(call.argument("language") ?: ""),
+                        theme = SyntaxThemes.getByName(call.argument("theme") ?: "", useDarkMode),
+                        emphasisLocations = tryGetEmphasisFromJson(call.argument("emphasisLocations"))
+                    )
 
-                highlights.getHighlightsAsync(
-                    object: DefaultHighlightsResultListener() {
-                        override fun onSuccess(highlights: List<CodeHighlight>) {
-                            result.success(highlights.toJson())
-                        }
+                    val output = highlights.getHighlights()
+                    result.success(output.toJson())
+                }
 
-                        override fun onCancel() {
-                            result.success(null)
-                        }
+                "getLanguages" -> result.success(SyntaxLanguage.getNames())
+                "getThemes" -> result.success(SyntaxThemes.getNames(useDarkMode))
+                "setDarkMode" -> {
+                    useDarkMode = call.argument("useDarkMode") ?: false
+                    result.success(null)
+                }
 
-                        override fun onError(exception: Throwable) {
-                            result.error("Error", exception.message, null)
-                        }
-                    }
-                )
-            }
-            "getLanguages" -> result.success(SyntaxLanguage.getNames())
-            "getThemes" -> result.success(SyntaxThemes.getNames(useDarkMode))
-            "setDarkMode" -> {
-                useDarkMode = call.argument("useDarkMode") ?: false
-                result.success(null)
-            }
-            else -> {
-                result.notImplemented()
+                else -> {
+                    result.notImplemented()
+                }
             }
+        } catch (e: Exception) {
+            result.error("Error", e.message, e)
         }
     }
 
diff --git a/example/lib/main.dart b/example/lib/main.dart
index 315c029..37bfeff 100644
--- a/example/lib/main.dart
+++ b/example/lib/main.dart
@@ -23,7 +23,7 @@ class _MyAppState extends State<MyApp> {
   final List<PhraseLocation> _emphasis = [];
 
   Future<void> _updateDarkMode(bool isDark) async {
-    _highlightsPlugin.setDarkMode(isDark);
+    await _highlightsPlugin.setDarkMode(isDark);
     _updateHighlights(_code ?? '');
   }
 
@@ -41,7 +41,7 @@ class _MyAppState extends State<MyApp> {
     _updateHighlights(_code ?? '');
   }
 
-  Future<void> _updateHighlights(String code) async {
+  _updateHighlights(String code) {
     _code = code;
     _highlightsPlugin
         .getHighlights(
@@ -49,13 +49,7 @@ class _MyAppState extends State<MyApp> {
       _language,
       _theme,
       _emphasis,
-    )
-        .then((value) {
-      setState(() {
-        value.sort((a, b) => a.location.start.compareTo(b.location.start));
-        _highlights = value.map((highlight) => highlight.toString()).toList();
-      });
-    });
+    );
   }
 
   void _addEmphasis(PhraseLocation location) {
diff --git a/lib/highlights_interface.dart b/lib/highlights_interface.dart
index 56c6616..60f2121 100644
--- a/lib/highlights_interface.dart
+++ b/lib/highlights_interface.dart
@@ -2,7 +2,7 @@ import 'package:highlights_plugin/model/code_highlight.dart';
 import 'package:highlights_plugin/model/phrase_location.dart';
 
 abstract interface class HighlightsInterface {
-  Future<List<CodeHighlight>> getHighlights(
+  void getHighlights(
     String code,
     String language,
     String theme,
diff --git a/lib/highlights_plugin.dart b/lib/highlights_plugin.dart
index b56e1f7..bb166ff 100644
--- a/lib/highlights_plugin.dart
+++ b/lib/highlights_plugin.dart
@@ -14,14 +14,14 @@ class HighlightsPlugin implements HighlightsInterface {
   final bool debug;
 
   @override
-  Future<List<CodeHighlight>> getHighlights(
+  void getHighlights(
     String code,
     String? language,
     String? theme,
     List<PhraseLocation>? emphasisLocations,
-  ) async {
+  ) {
     try {
-      return await HighlightsPluginPlatform.instance.getHighlights(
+      HighlightsPluginPlatform.instance.getHighlights(
         code,
         language,
         theme,
@@ -29,7 +29,7 @@ class HighlightsPlugin implements HighlightsInterface {
       );
     } catch (e, st) {
       _printDebugInfo(methods.getHighlights, e, st);
-      return [];
+      // return [];
     }
   }
 
diff --git a/lib/highlights_plugin_method_channel.dart b/lib/highlights_plugin_method_channel.dart
index 06af844..1f2f4f8 100644
--- a/lib/highlights_plugin_method_channel.dart
+++ b/lib/highlights_plugin_method_channel.dart
@@ -3,21 +3,26 @@ import 'dart:convert';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/services.dart';
 import 'package:highlights_plugin/highlights_interface.dart';
-import 'package:highlights_plugin/model/code_highlight.dart';
 import 'package:highlights_plugin/model/phrase_location.dart';
 import 'package:highlights_plugin/method_index.dart' as methods;
 import 'package:collection/collection.dart';
 
 import 'highlights_plugin_platform_interface.dart';
 
-/// An implementation of [HighlightsPluginPlatform] that uses method channels.
 class MethodChannelHighlightsPlugin extends HighlightsPluginPlatform
     implements HighlightsInterface {
-  MethodChannelHighlightsPlugin({required this.debug});
+  MethodChannelHighlightsPlugin({required this.debug}) {
+    BackgroundIsolateBinaryMessenger.ensureInitialized(
+      ServicesBinding.rootIsolateToken!,
+    );
+  }
 
-  /// The method channel used to interact with the native platform.
   @visibleForTesting
-  final methodChannel = const MethodChannel('highlights_plugin');
+  final methodChannel = MethodChannel(
+    'highlights_plugin',
+    StandardMethodCodec(),
+    BackgroundIsolateBinaryMessenger.instance,
+  );
 
   final bool debug;
 
@@ -25,34 +30,33 @@ class MethodChannelHighlightsPlugin extends HighlightsPluginPlatform
   List<String>? _cachedThemes;
 
   @override
-  Future<List<CodeHighlight>> getHighlights(
+  void getHighlights(
     String? code,
     String? language,
     String? theme,
     List<PhraseLocation>? emphasisLocations,
-  ) async {
+  ) {
     final arguments = {
       "code": code,
-      "language": (await _getLanguage(language)),
-      "theme": (await _getTheme(theme)),
+      "language": "java",
+      "theme": "monokai",
       "emphasisLocations": jsonEncode(emphasisLocations),
     };
 
-    final json = await methodChannel.invokeMethod(
+    final json = methodChannel.invokeMethod(
       methods.getHighlights,
       arguments,
     );
 
-    final data = jsonDecode(json);
+    // final data = jsonDecode(json);
 
-    if (data is List) {
-      return data.map((e) => CodeHighlight.fromJson(e)).toList();
-    } else {
-      _debugPrint(
-        '${methods.getHighlights}: Expected List but got ${data.runtimeType}',
-      );
-      return [];
-    }
+    // if (data is List) {
+    //   return data.map((e) => CodeHighlight.fromJson(e)).toList();
+    // } else {
+    //   _debugPrint(
+    //     '${methods.getHighlights}: Expected List but got ${data.runtimeType}',
+    //   );
+    //   return [];
   }
 
   @override
diff --git a/lib/highlights_plugin_platform_interface.dart b/lib/highlights_plugin_platform_interface.dart
index 09f286b..1852f67 100644
--- a/lib/highlights_plugin_platform_interface.dart
+++ b/lib/highlights_plugin_platform_interface.dart
@@ -32,7 +32,7 @@ abstract class HighlightsPluginPlatform extends PlatformInterface
   }
 
   @override
-  Future<List<CodeHighlight>> getHighlights(
+  void getHighlights(
     String? code,
     String? language,
     String? theme,

From 0c75b0b2dbeed84eef6727e2050b86e7b06532d3 Mon Sep 17 00:00:00 2001
From: tkadziolka <tmax0135@gmail.com>
Date: Thu, 28 Nov 2024 17:45:47 +0100
Subject: [PATCH 2/8] Removed async from ios

---
 ios/Classes/SwiftHighlightsPlugin.swift | 24 ++----------------------
 1 file changed, 2 insertions(+), 22 deletions(-)

diff --git a/ios/Classes/SwiftHighlightsPlugin.swift b/ios/Classes/SwiftHighlightsPlugin.swift
index 52a5dd5..00bcf50 100644
--- a/ios/Classes/SwiftHighlightsPlugin.swift
+++ b/ios/Classes/SwiftHighlightsPlugin.swift
@@ -45,30 +45,10 @@ public class SwiftHighlightsPlugin: NSObject, FlutterPlugin {
             theme: theme,
             emphasisLocations: emphasis
           )
-          
-          class Listener: DefaultHighlightsResultListener {
-              var flutterResult: FlutterResult
-
-              init(flutterResult: @escaping FlutterResult) {
-                  self.flutterResult = flutterResult
-              }
-
-              override func onStart() {}
-
-              override func onCancel() {
-                  flutterResult(nil)
-              }
-
-              override func onSuccess(result: [CodeHighlight]) {
-                  flutterResult(ExtensionsKt.toJson(result))
-              }
 
-              override func onError(exception: KotlinThrowable) {
-                  flutterResult(exception)
-              }
-          }
+          let highlightList = highlights.getHighlights();
 
-          highlights.getHighlightsAsync(listener: Listener(flutterResult: result));
+          result(ExtensionsKt.toJson(highlightList))
       case "setDarkMode":
           let map = call.arguments as! Dictionary<String, Any>
           useDarkMode = map["useDarkMode"] as? Bool ?? false

From 210f9b1be02e0dc4078f82210a9c800b7cef4401 Mon Sep 17 00:00:00 2001
From: tkadziolka <tmax0135@gmail.com>
Date: Mon, 2 Dec 2024 07:55:31 +0100
Subject: [PATCH 3/8] Setup initialization

---
 example/lib/main.dart                         | 22 +++++--
 lib/highlights_interface.dart                 |  4 +-
 lib/highlights_plugin.dart                    | 11 ++--
 lib/highlights_plugin_method_channel.dart     | 64 ++++++++++++-------
 lib/highlights_plugin_platform_interface.dart |  7 +-
 lib/method_index.dart                         |  1 +
 6 files changed, 73 insertions(+), 36 deletions(-)

diff --git a/example/lib/main.dart b/example/lib/main.dart
index 37bfeff..aa20754 100644
--- a/example/lib/main.dart
+++ b/example/lib/main.dart
@@ -1,4 +1,7 @@
+import 'dart:async';
+
 import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
 import 'package:highlights_plugin/highlights_plugin.dart';
 import 'package:highlights_plugin/model/phrase_location.dart';
 
@@ -44,12 +47,13 @@ class _MyAppState extends State<MyApp> {
   _updateHighlights(String code) {
     _code = code;
     _highlightsPlugin
-        .getHighlights(
-      _code ?? '',
-      _language,
-      _theme,
-      _emphasis,
-    );
+        .getHighlights(_code ?? '', _language, _theme, _emphasis)
+        .then((highlights) {
+      setState(() {
+        _highlights =
+            highlights.map((highlight) => highlight.toString()).toList();
+      });
+    });
   }
 
   void _addEmphasis(PhraseLocation location) {
@@ -57,6 +61,12 @@ class _MyAppState extends State<MyApp> {
     _updateHighlights(_code ?? '');
   }
 
+  @override
+  void initState() {
+    super.initState();
+    unawaited(_highlightsPlugin.initialize());
+  }
+
   @override
   Widget build(BuildContext context) {
     return MaterialApp(
diff --git a/lib/highlights_interface.dart b/lib/highlights_interface.dart
index 60f2121..4044ec2 100644
--- a/lib/highlights_interface.dart
+++ b/lib/highlights_interface.dart
@@ -2,7 +2,9 @@ import 'package:highlights_plugin/model/code_highlight.dart';
 import 'package:highlights_plugin/model/phrase_location.dart';
 
 abstract interface class HighlightsInterface {
-  void getHighlights(
+  Future<bool> initialize();
+
+  Future<List<CodeHighlight>> getHighlights(
     String code,
     String language,
     String theme,
diff --git a/lib/highlights_plugin.dart b/lib/highlights_plugin.dart
index bb166ff..8e3ef1d 100644
--- a/lib/highlights_plugin.dart
+++ b/lib/highlights_plugin.dart
@@ -14,14 +14,17 @@ class HighlightsPlugin implements HighlightsInterface {
   final bool debug;
 
   @override
-  void getHighlights(
+  Future<bool> initialize() => HighlightsPluginPlatform.instance.initialize();
+
+  @override
+  Future<List<CodeHighlight>> getHighlights(
     String code,
     String? language,
     String? theme,
     List<PhraseLocation>? emphasisLocations,
-  ) {
+  ){
     try {
-      HighlightsPluginPlatform.instance.getHighlights(
+      return HighlightsPluginPlatform.instance.getHighlights(
         code,
         language,
         theme,
@@ -29,7 +32,7 @@ class HighlightsPlugin implements HighlightsInterface {
       );
     } catch (e, st) {
       _printDebugInfo(methods.getHighlights, e, st);
-      // return [];
+      return Future.value([]);
     }
   }
 
diff --git a/lib/highlights_plugin_method_channel.dart b/lib/highlights_plugin_method_channel.dart
index 1f2f4f8..6ebd11f 100644
--- a/lib/highlights_plugin_method_channel.dart
+++ b/lib/highlights_plugin_method_channel.dart
@@ -1,28 +1,22 @@
 import 'dart:convert';
+import 'dart:core';
 
+import 'package:collection/collection.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/services.dart';
 import 'package:highlights_plugin/highlights_interface.dart';
+import 'package:highlights_plugin/model/code_highlight.dart';
 import 'package:highlights_plugin/model/phrase_location.dart';
 import 'package:highlights_plugin/method_index.dart' as methods;
-import 'package:collection/collection.dart';
 
 import 'highlights_plugin_platform_interface.dart';
 
 class MethodChannelHighlightsPlugin extends HighlightsPluginPlatform
     implements HighlightsInterface {
-  MethodChannelHighlightsPlugin({required this.debug}) {
-    BackgroundIsolateBinaryMessenger.ensureInitialized(
-      ServicesBinding.rootIsolateToken!,
-    );
-  }
+  MethodChannelHighlightsPlugin({required this.debug});
 
   @visibleForTesting
-  final methodChannel = MethodChannel(
-    'highlights_plugin',
-    StandardMethodCodec(),
-    BackgroundIsolateBinaryMessenger.instance,
-  );
+  late MethodChannel methodChannel;
 
   final bool debug;
 
@@ -30,33 +24,55 @@ class MethodChannelHighlightsPlugin extends HighlightsPluginPlatform
   List<String>? _cachedThemes;
 
   @override
-  void getHighlights(
+  Future<bool> initialize() async {
+    try {
+      BackgroundIsolateBinaryMessenger.ensureInitialized(
+        ServicesBinding.rootIsolateToken!,
+      );
+      methodChannel = MethodChannel(
+        'highlights_plugin',
+        StandardMethodCodec(),
+        BackgroundIsolateBinaryMessenger.instance,
+      );
+      return true;
+    } catch (e, s) {
+      _debugPrint('${methods.initialize}: Error: $e, $s');
+      return false;
+    }
+  }
+
+  @override
+  Future<List<CodeHighlight>> getHighlights(
     String? code,
     String? language,
     String? theme,
     List<PhraseLocation>? emphasisLocations,
-  ) {
+  ) async {
     final arguments = {
       "code": code,
-      "language": "java",
-      "theme": "monokai",
+      "language": await _getLanguage(language),
+      "theme": await _getTheme(theme),
       "emphasisLocations": jsonEncode(emphasisLocations),
     };
 
-    final json = methodChannel.invokeMethod(
+    final highlightsJson = await methodChannel.invokeMethod(
       methods.getHighlights,
       arguments,
     );
 
-    // final data = jsonDecode(json);
+    final data = await compute(
+      (json) => jsonDecode(json),
+      highlightsJson,
+    );
 
-    // if (data is List) {
-    //   return data.map((e) => CodeHighlight.fromJson(e)).toList();
-    // } else {
-    //   _debugPrint(
-    //     '${methods.getHighlights}: Expected List but got ${data.runtimeType}',
-    //   );
-    //   return [];
+    if (data is List) {
+      return data.map((e) => CodeHighlight.fromJson(e)).toList();
+    } else {
+      _debugPrint(
+        '${methods.getHighlights}: Expected List but got ${data.runtimeType}',
+      );
+      return [];
+    }
   }
 
   @override
diff --git a/lib/highlights_plugin_platform_interface.dart b/lib/highlights_plugin_platform_interface.dart
index 1852f67..e648096 100644
--- a/lib/highlights_plugin_platform_interface.dart
+++ b/lib/highlights_plugin_platform_interface.dart
@@ -32,7 +32,12 @@ abstract class HighlightsPluginPlatform extends PlatformInterface
   }
 
   @override
-  void getHighlights(
+  Future<bool> initialize() {
+    throw UnimplementedError('${methods.initialize} has not been implemented.');
+  }
+
+  @override
+  Future<List<CodeHighlight>> getHighlights(
     String? code,
     String? language,
     String? theme,
diff --git a/lib/method_index.dart b/lib/method_index.dart
index 1f18601..057adfd 100644
--- a/lib/method_index.dart
+++ b/lib/method_index.dart
@@ -1,3 +1,4 @@
+const initialize = 'initialize';
 const getHighlights = 'getHighlights';
 const getLanguages = 'getLanguages';
 const getThemes = 'getThemes';

From 1d06bf5591c5b4427e3f2dcdffff2210a49cd380 Mon Sep 17 00:00:00 2001
From: tkadziolka <tmax0135@gmail.com>
Date: Mon, 2 Dec 2024 08:11:51 +0100
Subject: [PATCH 4/8] Renamed classes

---
 ...art => highlights_platform_interface.dart} | 22 +++++++------------
 lib/highlights_plugin.dart                    | 15 +++++++------
 ...el.dart => native_platform_interface.dart} |  8 +++----
 ...rt => native_platform_interface_test.dart} |  5 ++---
 4 files changed, 22 insertions(+), 28 deletions(-)
 rename lib/{highlights_plugin_platform_interface.dart => highlights_platform_interface.dart} (63%)
 rename lib/{highlights_plugin_method_channel.dart => native_platform_interface.dart} (93%)
 rename test/{highlights_plugin_method_channel_test.dart => native_platform_interface_test.dart} (91%)

diff --git a/lib/highlights_plugin_platform_interface.dart b/lib/highlights_platform_interface.dart
similarity index 63%
rename from lib/highlights_plugin_platform_interface.dart
rename to lib/highlights_platform_interface.dart
index e648096..dfdfa60 100644
--- a/lib/highlights_plugin_platform_interface.dart
+++ b/lib/highlights_platform_interface.dart
@@ -1,32 +1,26 @@
 import 'package:highlights_plugin/model/code_highlight.dart';
 import 'package:highlights_plugin/model/phrase_location.dart';
+import 'package:highlights_plugin/native_platform_interface.dart';
 import 'package:plugin_platform_interface/plugin_platform_interface.dart';
 
 import 'highlights_interface.dart';
-import 'highlights_plugin_method_channel.dart';
 import 'method_index.dart' as methods;
 
-abstract class HighlightsPluginPlatform extends PlatformInterface
+abstract class HighlightsPlatformInterface extends PlatformInterface
     implements HighlightsInterface {
-  /// Constructs a HighlightsPluginPlatform.
-  HighlightsPluginPlatform() : super(token: _token);
+
+  HighlightsPlatformInterface() : super(token: _token);
 
   static final Object _token = Object();
 
   static bool debug = false;
 
-  static HighlightsPluginPlatform _instance =
-      MethodChannelHighlightsPlugin(debug: debug);
+  static HighlightsPlatformInterface _instance =
+      NativePlatformInterface(debug: debug);
 
-  /// The default instance of [HighlightsPluginPlatform] to use.
-  ///
-  /// Defaults to [MethodChannelHighlightsPlugin].
-  static HighlightsPluginPlatform get instance => _instance;
+  static HighlightsPlatformInterface get instance => _instance;
 
-  /// Platform-specific implementations should set this with their own
-  /// platform-specific class that extends [HighlightsPluginPlatform] when
-  /// they register themselves.
-  static set instance(HighlightsPluginPlatform instance) {
+  static set instance(HighlightsPlatformInterface instance) {
     PlatformInterface.verifyToken(instance, _token);
     _instance = instance;
   }
diff --git a/lib/highlights_plugin.dart b/lib/highlights_plugin.dart
index 8e3ef1d..9bb8470 100644
--- a/lib/highlights_plugin.dart
+++ b/lib/highlights_plugin.dart
@@ -1,20 +1,21 @@
 import 'package:flutter/cupertino.dart';
+import 'package:highlights_plugin/highlights_platform_interface.dart';
 import 'package:highlights_plugin/model/code_highlight.dart';
 import 'package:highlights_plugin/model/phrase_location.dart';
 import 'package:highlights_plugin/method_index.dart' as methods;
 import 'highlights_interface.dart';
-import 'highlights_plugin_platform_interface.dart';
 
 class HighlightsPlugin implements HighlightsInterface {
   HighlightsPlugin({this.debug = false}) {
+    // TODO Test logger flag
     // Setup before first `instance` getter call
-    HighlightsPluginPlatform.debug = debug;
+    HighlightsPlatformInterface.debug = debug;
   }
 
   final bool debug;
 
   @override
-  Future<bool> initialize() => HighlightsPluginPlatform.instance.initialize();
+  Future<bool> initialize() => HighlightsPlatformInterface.instance.initialize();
 
   @override
   Future<List<CodeHighlight>> getHighlights(
@@ -24,7 +25,7 @@ class HighlightsPlugin implements HighlightsInterface {
     List<PhraseLocation>? emphasisLocations,
   ){
     try {
-      return HighlightsPluginPlatform.instance.getHighlights(
+      return HighlightsPlatformInterface.instance.getHighlights(
         code,
         language,
         theme,
@@ -39,7 +40,7 @@ class HighlightsPlugin implements HighlightsInterface {
   @override
   Future<List<String>> getLanguages() async {
     try {
-      return await HighlightsPluginPlatform.instance.getLanguages();
+      return await HighlightsPlatformInterface.instance.getLanguages();
     } catch (e, st) {
       _printDebugInfo(methods.getLanguages, e, st);
       return [];
@@ -49,7 +50,7 @@ class HighlightsPlugin implements HighlightsInterface {
   @override
   Future<List<String>> getThemes() async {
     try {
-      return await HighlightsPluginPlatform.instance.getThemes();
+      return await HighlightsPlatformInterface.instance.getThemes();
     } catch (e, st) {
       _printDebugInfo(methods.getThemes, e, st);
       return [];
@@ -59,7 +60,7 @@ class HighlightsPlugin implements HighlightsInterface {
   @override
   Future<void> setDarkMode(bool useDarkMode) {
     try {
-      return HighlightsPluginPlatform.instance.setDarkMode(useDarkMode);
+      return HighlightsPlatformInterface.instance.setDarkMode(useDarkMode);
     } catch (e, st) {
       _printDebugInfo(methods.setDarkMode, e, st);
       return Future.value();
diff --git a/lib/highlights_plugin_method_channel.dart b/lib/native_platform_interface.dart
similarity index 93%
rename from lib/highlights_plugin_method_channel.dart
rename to lib/native_platform_interface.dart
index 6ebd11f..834f726 100644
--- a/lib/highlights_plugin_method_channel.dart
+++ b/lib/native_platform_interface.dart
@@ -5,15 +5,14 @@ import 'package:collection/collection.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/services.dart';
 import 'package:highlights_plugin/highlights_interface.dart';
+import 'package:highlights_plugin/highlights_platform_interface.dart';
 import 'package:highlights_plugin/model/code_highlight.dart';
 import 'package:highlights_plugin/model/phrase_location.dart';
 import 'package:highlights_plugin/method_index.dart' as methods;
 
-import 'highlights_plugin_platform_interface.dart';
-
-class MethodChannelHighlightsPlugin extends HighlightsPluginPlatform
+class NativePlatformInterface extends HighlightsPlatformInterface
     implements HighlightsInterface {
-  MethodChannelHighlightsPlugin({required this.debug});
+  NativePlatformInterface({required this.debug});
 
   @visibleForTesting
   late MethodChannel methodChannel;
@@ -34,6 +33,7 @@ class MethodChannelHighlightsPlugin extends HighlightsPluginPlatform
         StandardMethodCodec(),
         BackgroundIsolateBinaryMessenger.instance,
       );
+      _debugPrint('${methods.initialize}: Initialization completed!');
       return true;
     } catch (e, s) {
       _debugPrint('${methods.initialize}: Error: $e, $s');
diff --git a/test/highlights_plugin_method_channel_test.dart b/test/native_platform_interface_test.dart
similarity index 91%
rename from test/highlights_plugin_method_channel_test.dart
rename to test/native_platform_interface_test.dart
index f7978b4..d90e678 100644
--- a/test/highlights_plugin_method_channel_test.dart
+++ b/test/native_platform_interface_test.dart
@@ -1,14 +1,13 @@
 import 'package:flutter/services.dart';
 import 'package:flutter_test/flutter_test.dart';
-import 'package:highlights_plugin/highlights_plugin_method_channel.dart';
 
 import 'package:highlights_plugin/method_index.dart' as methods;
 import 'package:highlights_plugin/model/code_highlight.dart';
 import 'package:highlights_plugin/model/phrase_location.dart';
+import 'package:highlights_plugin/native_platform_interface.dart';
 
 void main() {
-  MethodChannelHighlightsPlugin platform =
-      MethodChannelHighlightsPlugin(debug: true);
+  NativePlatformInterface platform = NativePlatformInterface(debug: true);
   const MethodChannel channel = MethodChannel('highlights_plugin');
 
   TestWidgetsFlutterBinding.ensureInitialized();

From 9e41baf7f162d0d71abcc3ebafa8b69bbf05b471 Mon Sep 17 00:00:00 2001
From: tkadziolka <tmax0135@gmail.com>
Date: Mon, 2 Dec 2024 08:31:45 +0100
Subject: [PATCH 5/8] Formatted code

---
 example/macos/Podfile.lock                    |  6 ------
 .../macos/Runner.xcodeproj/project.pbxproj    | 20 +------------------
 .../xcshareddata/xcschemes/Runner.xcscheme    |  2 +-
 example/macos/Runner/AppDelegate.swift        |  2 +-
 example/test/widget_test.dart                 |  4 ++--
 lib/highlights_platform_interface.dart        | 10 ++++++----
 lib/highlights_plugin.dart                    |  5 +++--
 lib/method_index.dart                         |  2 +-
 lib/model/phrase_location.dart                |  4 +---
 9 files changed, 16 insertions(+), 39 deletions(-)

diff --git a/example/macos/Podfile.lock b/example/macos/Podfile.lock
index 2d8595f..b553f83 100644
--- a/example/macos/Podfile.lock
+++ b/example/macos/Podfile.lock
@@ -1,21 +1,15 @@
 PODS:
   - FlutterMacOS (1.0.0)
-  - highlights_plugin (0.0.1):
-    - FlutterMacOS
 
 DEPENDENCIES:
   - FlutterMacOS (from `Flutter/ephemeral`)
-  - highlights_plugin (from `Flutter/ephemeral/.symlinks/plugins/highlights_plugin/macos`)
 
 EXTERNAL SOURCES:
   FlutterMacOS:
     :path: Flutter/ephemeral
-  highlights_plugin:
-    :path: Flutter/ephemeral/.symlinks/plugins/highlights_plugin/macos
 
 SPEC CHECKSUMS:
   FlutterMacOS: 8f6f14fa908a6fb3fba0cd85dbd81ec4b251fb24
-  highlights_plugin: 8a7d54a1fffabf787c85c83f91317b3cc3bdd56c
 
 PODFILE CHECKSUM: 353c8bcc5d5b0994e508d035b5431cfe18c1dea7
 
diff --git a/example/macos/Runner.xcodeproj/project.pbxproj b/example/macos/Runner.xcodeproj/project.pbxproj
index bcf17bf..9f75b2b 100644
--- a/example/macos/Runner.xcodeproj/project.pbxproj
+++ b/example/macos/Runner.xcodeproj/project.pbxproj
@@ -184,7 +184,6 @@
 				33CC10EB2044A3C60003C045 /* Resources */,
 				33CC110E2044A8840003C045 /* Bundle Framework */,
 				3399D490228B24CF009A79C7 /* ShellScript */,
-				CD40F6F01B76A7B123DDBE56 /* [CP] Embed Pods Frameworks */,
 			);
 			buildRules = (
 			);
@@ -203,7 +202,7 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 0920;
-				LastUpgradeCheck = 1430;
+				LastUpgradeCheck = 1510;
 				ORGANIZATIONNAME = "";
 				TargetAttributes = {
 					33CC10EC2044A3C60003C045 = {
@@ -314,23 +313,6 @@
 			shellPath = /bin/sh;
 			shellScript = "\"$FLUTTER_ROOT\"/packages/flutter_tools/bin/macos_assemble.sh && touch Flutter/ephemeral/tripwire";
 		};
-		CD40F6F01B76A7B123DDBE56 /* [CP] Embed Pods Frameworks */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputFileListPaths = (
-				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-input-files.xcfilelist",
-			);
-			name = "[CP] Embed Pods Frameworks";
-			outputFileListPaths = (
-				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-output-files.xcfilelist",
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n";
-			showEnvVarsInLog = 0;
-		};
 /* End PBXShellScriptBuildPhase section */
 
 /* Begin PBXSourcesBuildPhase section */
diff --git a/example/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/example/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
index 334149c..9a0d9e7 100644
--- a/example/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
+++ b/example/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1430"
+   LastUpgradeVersion = "1510"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/example/macos/Runner/AppDelegate.swift b/example/macos/Runner/AppDelegate.swift
index d53ef64..8e02df2 100644
--- a/example/macos/Runner/AppDelegate.swift
+++ b/example/macos/Runner/AppDelegate.swift
@@ -1,7 +1,7 @@
 import Cocoa
 import FlutterMacOS
 
-@NSApplicationMain
+@main
 class AppDelegate: FlutterAppDelegate {
   override func applicationShouldTerminateAfterLastWindowClosed(_ sender: NSApplication) -> Bool {
     return true
diff --git a/example/test/widget_test.dart b/example/test/widget_test.dart
index e993fef..1afa8d0 100644
--- a/example/test/widget_test.dart
+++ b/example/test/widget_test.dart
@@ -18,8 +18,8 @@ void main() {
     // Verify that platform version is retrieved.
     expect(
       find.byWidgetPredicate(
-        (Widget widget) => widget is Text &&
-                           widget.data!.startsWith('Running on:'),
+        (Widget widget) =>
+            widget is Text && widget.data!.startsWith('Running on:'),
       ),
       findsOneWidget,
     );
diff --git a/lib/highlights_platform_interface.dart b/lib/highlights_platform_interface.dart
index dfdfa60..cefb6a8 100644
--- a/lib/highlights_platform_interface.dart
+++ b/lib/highlights_platform_interface.dart
@@ -8,7 +8,6 @@ import 'method_index.dart' as methods;
 
 abstract class HighlightsPlatformInterface extends PlatformInterface
     implements HighlightsInterface {
-
   HighlightsPlatformInterface() : super(token: _token);
 
   static final Object _token = Object();
@@ -37,12 +36,14 @@ abstract class HighlightsPlatformInterface extends PlatformInterface
     String? theme,
     List<PhraseLocation>? emphasisLocations,
   ) {
-    throw UnimplementedError('${methods.getHighlights} has not been implemented.');
+    throw UnimplementedError(
+        '${methods.getHighlights} has not been implemented.');
   }
 
   @override
   Future<List<String>> getLanguages() {
-    throw UnimplementedError('${methods.getLanguages} has not been implemented.');
+    throw UnimplementedError(
+        '${methods.getLanguages} has not been implemented.');
   }
 
   @override
@@ -52,6 +53,7 @@ abstract class HighlightsPlatformInterface extends PlatformInterface
 
   @override
   Future<void> setDarkMode(bool useDarkMode) {
-    throw UnimplementedError('${methods.setDarkMode} has not been implemented.');
+    throw UnimplementedError(
+        '${methods.setDarkMode} has not been implemented.');
   }
 }
diff --git a/lib/highlights_plugin.dart b/lib/highlights_plugin.dart
index 9bb8470..04dd464 100644
--- a/lib/highlights_plugin.dart
+++ b/lib/highlights_plugin.dart
@@ -15,7 +15,8 @@ class HighlightsPlugin implements HighlightsInterface {
   final bool debug;
 
   @override
-  Future<bool> initialize() => HighlightsPlatformInterface.instance.initialize();
+  Future<bool> initialize() =>
+      HighlightsPlatformInterface.instance.initialize();
 
   @override
   Future<List<CodeHighlight>> getHighlights(
@@ -23,7 +24,7 @@ class HighlightsPlugin implements HighlightsInterface {
     String? language,
     String? theme,
     List<PhraseLocation>? emphasisLocations,
-  ){
+  ) {
     try {
       return HighlightsPlatformInterface.instance.getHighlights(
         code,
diff --git a/lib/method_index.dart b/lib/method_index.dart
index 057adfd..c3654dc 100644
--- a/lib/method_index.dart
+++ b/lib/method_index.dart
@@ -2,4 +2,4 @@ const initialize = 'initialize';
 const getHighlights = 'getHighlights';
 const getLanguages = 'getLanguages';
 const getThemes = 'getThemes';
-const setDarkMode = 'setDarkMode';
\ No newline at end of file
+const setDarkMode = 'setDarkMode';
diff --git a/lib/model/phrase_location.dart b/lib/model/phrase_location.dart
index ca4b4a7..bfcb47d 100644
--- a/lib/model/phrase_location.dart
+++ b/lib/model/phrase_location.dart
@@ -24,9 +24,7 @@ class PhraseLocation {
   bool operator ==(Object other) {
     if (identical(this, other)) return true;
 
-    return other is PhraseLocation &&
-        other.start == start &&
-        other.end == end;
+    return other is PhraseLocation && other.start == start && other.end == end;
   }
 
   @override

From 50aab3f03cc76c9275c13e01bb7df6240e5e92fb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tomasz=20K=C4=85dzio=C5=82ka?= <tmax0135@gmail.com>
Date: Mon, 2 Dec 2024 08:43:12 +0100
Subject: [PATCH 6/8] Updated README.md

---
 README.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/README.md b/README.md
index ec0d32d..4fbcc9c 100644
--- a/README.md
+++ b/README.md
@@ -15,6 +15,10 @@ flutter pub add highlights_plugin
 ```dart
 final plugin = HighlightsPlugin(debug: true);
 
+await success = plugin.initialize();
+```
+
+```dart
 // ['kotlin', 'dart', 'swift', 'php', 'java', ...]
 final languages = await plugin.getLanguages();
 // ['monokai', 'darcula', 'notepad', ...]

From 6f1ec31779dccc9e0f13718b678ce1a454b08e3b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tomasz=20K=C4=85dzio=C5=82ka?= <tmax0135@gmail.com>
Date: Mon, 2 Dec 2024 08:45:11 +0100
Subject: [PATCH 7/8] Corrected example in README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 4fbcc9c..f3581c9 100644
--- a/README.md
+++ b/README.md
@@ -15,7 +15,7 @@ flutter pub add highlights_plugin
 ```dart
 final plugin = HighlightsPlugin(debug: true);
 
-await success = plugin.initialize();
+final success = await plugin.initialize();
 ```
 
 ```dart

From c36e0e8d365242b5dc3034503c0866a02e688f59 Mon Sep 17 00:00:00 2001
From: tkadziolka <tmax0135@gmail.com>
Date: Tue, 3 Dec 2024 10:33:43 +0100
Subject: [PATCH 8/8] fix: unused import

---
 example/lib/main.dart | 1 -
 1 file changed, 1 deletion(-)

diff --git a/example/lib/main.dart b/example/lib/main.dart
index aa20754..e23b665 100644
--- a/example/lib/main.dart
+++ b/example/lib/main.dart
@@ -1,7 +1,6 @@
 import 'dart:async';
 
 import 'package:flutter/material.dart';
-import 'package:flutter/services.dart';
 import 'package:highlights_plugin/highlights_plugin.dart';
 import 'package:highlights_plugin/model/phrase_location.dart';