Skip to content
This repository was archived by the owner on Aug 31, 2021. It is now read-only.

Commit 1106deb

Browse files
authored
Merge pull request #2064 from montegoulding/fixextensions
[[ Bug ]] Fix extension dependency ordering
2 parents 47f7388 + 4ad6c65 commit 1106deb

File tree

1 file changed

+14
-8
lines changed

1 file changed

+14
-8
lines changed

Toolset/libraries/revideextensionlibrary.livecodescript

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -843,26 +843,32 @@ private function __fetchExtensionManifestData pFolder, pExtFile
843843
return tDataA
844844
end __fetchExtensionManifestData
845845

846-
private command __extensionAddDependenciesToRequiresArray pExtension, @xRequiresA
846+
private command __extensionAddDependenciesToRequiresArray \
847+
pExtension, @xRequiresA, @xExtensions
848+
847849
local tDependentsA
848850
put revIDEExtensionProperty(pExtension, "requires") into tDependentsA
849-
850-
repeat for each element tElement in tDependentsA
851+
852+
repeat for each element tElement in tDependentsA
851853
if tElement is not among the keys of xRequiresA then
852-
__extensionAddDependenciesToRequiresArray tElement, xRequiresA
854+
__extensionAddDependenciesToRequiresArray \
855+
tElement, xRequiresA, xExtensions
853856
end if
854857
addToList tElement, xRequiresA[pExtension]
855-
end repeat
858+
end repeat
859+
860+
put empty into xExtensions[pExtension]
856861
end __extensionAddDependenciesToRequiresArray
857862

858863
function revIDEExtensionsOrderByDependency pExtensions
859864
# Accumulate an array of dependencies
860-
local tRequiresA
865+
local tRequiresA, tExtensions
861866
repeat for each line tExtension in pExtensions
862-
__extensionAddDependenciesToRequiresArray tExtension, tRequiresA
867+
__extensionAddDependenciesToRequiresArray \
868+
tExtension, tRequiresA, tExtensions
863869
end repeat
864870

865-
return extensionOrderByDependency(the keys of tRequiresA, tRequiresA)
871+
return extensionOrderByDependency(the keys of tExtensions, tRequiresA)
866872
end revIDEExtensionsOrderByDependency
867873

868874
private function isUserExtension pData

0 commit comments

Comments
 (0)