From 6129b719059cc970aa7f19c9509528204a7c1370 Mon Sep 17 00:00:00 2001
From: girst <girst@users.noreply.github.com>
Date: Sun, 14 May 2023 13:33:57 +0200
Subject: [PATCH] Port osfile.jsm usage to IOUtils

Note that this raises the minimum supported Firefox version to 84
(PathUtils implemented in bugzil.la/1671035).

see also: bugzil.la/1776480
https://hg.mozilla.org/mozilla-central/diff/b9ffe29caab3d7d3f62044300610f8efa0f8e934/dom/base/ContentAreaDropListener.jsm
https://hg.mozilla.org/mozilla-central/diff/29a5e2a74be72d4c6a7b41e0d1879aca3de1263f/toolkit/components/printing/content/printUtils.js
---
 extension/lib/config.coffee | 6 ++----
 extension/lib/utils.coffee  | 3 +--
 package.json                | 2 +-
 3 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/extension/lib/config.coffee b/extension/lib/config.coffee
index ef3c94c..a3bb267 100644
--- a/extension/lib/config.coffee
+++ b/extension/lib/config.coffee
@@ -5,8 +5,6 @@ messageManager = require('./message-manager')
 utils = require('./utils')
 prefs = require('./prefs')
 
-{OS} = ChromeUtils.import('resource://gre/modules/osfile.jsm')
-
 load = (vimfx, options = null, callback = ->) ->
   configDir = vimfx.options.config_file_directory
 
@@ -46,11 +44,11 @@ checkSandbox = (expandedDir) ->
 
 loadFile = (dir, file, scope) ->
   expandedDir = utils.expandPath(dir)
-  uri = OS.Path.toFileURI(OS.Path.join(expandedDir, file))
+  uri = PathUtils.toFileURI(PathUtils.join(expandedDir, file))
   try
     Services.scriptloader.loadSubScriptWithOptions(uri, {
       target: Object.assign({
-        __dirname: OS.Path.toFileURI(expandedDir),
+        __dirname: PathUtils.toFileURI(expandedDir),
         Services: Services
       }, scope)
       charset: 'UTF-8'
diff --git a/extension/lib/utils.coffee b/extension/lib/utils.coffee
index c8dfdc1..2cc1423 100644
--- a/extension/lib/utils.coffee
+++ b/extension/lib/utils.coffee
@@ -1,7 +1,6 @@
 # This file contains lots of different helper functions.
 
 {E10SUtils} = ChromeUtils.import('resource://gre/modules/E10SUtils.jsm')
-{OS} = ChromeUtils.import('resource://gre/modules/osfile.jsm')
 {PlacesUIUtils} = ChromeUtils.import('resource:///modules/PlacesUIUtils.jsm')
 {PrivateBrowsingUtils} =
   ChromeUtils.import('resource://gre/modules/PrivateBrowsingUtils.jsm')
@@ -710,7 +709,7 @@ sum = (numbers) -> numbers.reduce(((sum, number) -> sum + number), 0)
 
 expandPath = (path) ->
   if path.startsWith('~/') or path.startsWith('~\\')
-    return OS.Constants.Path.homeDir + path[1..]
+    return Services.dirsvc.get('Home', Ci.nsIFile).path + path[1..]
   else
     return path
 
diff --git a/package.json b/package.json
index 43d14c2..ec816c0 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
   "name": "VimFx",
   "version": "0.25.0",
   "firefoxVersions": {
-    "min": "68.0",
+    "min": "84.0",
     "max": "*"
   },
   "license": "MIT",
-- 
2.39.3