Merge pull request #1831 from livecode/bugfix-lcs_extensions

[[ Extensions ]] Various fixes for issues caused by script extensions

Author: Monte Goulding

Toolset/libraries/revidedeveloperextensionlibrary.livecodescript

@@ -95,9 +95,9 @@ Summary: Returns an array of details of the extensions found in user folders
 Returns (array):
 { key: The path to the folder containing the extensions
 value (array): The array of details pertaining to the extension
-{ key: "id"
+{ key: "name"
 value: The extension ID
-key: "name"
+key: "title"
 value: The title of the extension
 key: "author"
 value: The author of the extension
@@ -236,7 +236,7 @@ private function __revIDEDeveloperExtensionFetchFolderDetails pFolder, pFile
 
       # If either we had to generate the new docs data or get it from the file, parse to a docs library array
       local tLibraryA
-      dispatch function "revDocsParseDocTextToLibraryArray" to stack "revDocsParser" with tData, tDetailsA["name"], tDetailsA["author"]
+      dispatch function "revDocsParseDocTextToLibraryArray" to stack "revDocsParser" with tData, tDetailsA["title"], tDetailsA["author"]
       put the result into tLibraryA
       put tLibraryA["doc"] into tDetailsA["api"]
       put tAPIFolder & slash & "api.lcdoc" into tDetailsA["api_file"]
@@ -431,7 +431,7 @@ on revIDEDeveloperExtensionTest pPath
    end if
 
    # AL-2015-07-15: [[ Bug ]] If the details of the extension doesn't include an ID, then the compile failed
-   if tDetailsA["id"] is empty then
+   if tDetailsA["name"] is empty then
       __revIDEDeveloperExtensionSendError "Could not compile module" && pPath
       exit revIDEDeveloperExtensionTest
    end if
@@ -497,7 +497,7 @@ on revIDEDeveloperExtensionCreateTestStack pPath, pRectsA, pDetailsA
 end revIDEDeveloperExtensionCreateTestStack
 
 on __revIDEDeveloperExtensionDoCreateTestStack pPath, tRectsA, pDetailsA
-   revIDEExtensionLoad pDetailsA["id"], pPath, pDetailsA["version"]
+   revIDEExtensionLoad pDetailsA["name"], pPath, pDetailsA["version"]
 
    local tResult
    put the result into tResult
@@ -518,16 +518,16 @@ on __revIDEDeveloperExtensionDoCreateTestStack pPath, tRectsA, pDetailsA
          set the loc of stack "LiveCode Extension Test Window" to tRectsA["loc"]
       end if
       set the destroyStack of stack "LiveCode Extension Test Window" to true
-      set the title of it to pDetailsA["name"]
+      set the title of it to pDetailsA["title"]
       set the script of it to __testStackScript()
       go stack "LiveCode Extension Test Window"
-      revIDECreateObject pDetailsA["id"], the long id of the defaultStack, \
+      revIDECreateObject pDetailsA["name"], the long id of the defaultStack, \
             (the width of the defaultStack / 2) & comma & (the height of the defaultStack / 2)
       unlock messages
    end if
 
    if there is not a widget 1 of stack "LiveCode Extension Test Window" then
-      __revIDEDeveloperExtensionSendError "failed to create widget" && pDetailsA["id"]
+      __revIDEDeveloperExtensionSendError "failed to create widget" && pDetailsA["name"]
       __revIDEDeveloperExtensionDoClearTestStack
       exit __revIDEDeveloperExtensionDoCreateTestStack
    end if
@@ -536,7 +536,7 @@ on __revIDEDeveloperExtensionDoCreateTestStack pPath, tRectsA, pDetailsA
       set the rect of widget 1 of stack "LiveCode Extension Test Window" to tRectsA["wrect"]
    end if
 
-   set the cCurExtension of stack "LiveCode Extension Test Window" to pDetailsA["id"]
+   set the cCurExtension of stack "LiveCode Extension Test Window" to pDetailsA["name"]
    unlock screen
 end __revIDEDeveloperExtensionDoCreateTestStack
 
@@ -572,12 +572,12 @@ on revIDEDeveloperExtensionUninstall pPath
    local tDetailsA
    put revIDEDeveloperExtension(pPath) into tDetailsA
 
-   if tDetailsA["id"] is empty then
+   if tDetailsA["name"] is empty then
       __revIDEDeveloperExtensionSendError "Extension id lost from" && pPath & ": cannot uninstall"
       exit revIDEDeveloperExtensionUninstall
    end if
 
-   revIDEUninstallExtension tDetailsA["id"]
+   revIDEUninstallExtension tDetailsA["name"]
 
 end revIDEDeveloperExtensionUninstall
 
@@ -787,11 +787,11 @@ private on __revIDEDeveloperExtensionBuildPackage pFolder, pTargetFolder, @rBuil
    end if
 
    local tTargetName
-   if tDetailsA["id"] is empty then
+   if tDetailsA["name"] is empty then
       __revIDEDeveloperExtensionSendError "no id found in " && tFullpath
       return "no id found"
    end if
-   put tDetailsA["id"] into tTargetName
+   put tDetailsA["name"] into tTargetName
 
    local tTargetVersion
    if tDetailsA["version"] is empty then
@@ -1024,7 +1024,7 @@ on revIDEDeveloperExtensionEditDefaultScript pFolder
    put tSupportFolder & "/defaultscript.livecodescript" into tDefaultScript
 
    local tExpectedName
-   put sExtensionDetailsA[pFolder]["id"] & ".__DefaultScript" into tExpectedName
+   put sExtensionDetailsA[pFolder]["name"] & ".__DefaultScript" into tExpectedName
    if there is a file tDefaultScript then
       try
          # If we have a valid stack, open it and edit the script
@@ -1060,5 +1060,5 @@ on revIDEDeveloperExtensionEditDefaultScript pFolder
 end revIDEDeveloperExtensionEditDefaultScript
 
 function revIDEDeveloperExtensionFetchDefaultScript pFolder
-   return revIDEExtensionFetchDefaultScript(pFolder, sExtensionDetailsA[pFolder]["id"], false)
+   return revIDEExtensionFetchDefaultScript(pFolder, sExtensionDetailsA[pFolder]["name"], false)
 end revIDEDeveloperExtensionFetchDefaultScript

Toolset/libraries/revideextensionlibrary.livecodescript

@@ -1099,8 +1099,11 @@ private command __revIDELCSExtensionLoad pID, pFolder, pVersion, pStatus, pError
    end if
 
    # Update name, status, error, and whether the extension comes with the IDE
-   __extensionPropertySet tCacheIndex, "name", pID
-   __extensionPropertySet tCacheIndex, "type_id", pID  & "." & pVersion 
+   local tId
+   put the short name of stack \
+         revInternal__LoadedLibraryStackName(item 1 of pSourceFile) into tId
+   __extensionPropertySet tCacheIndex, "name", tId
+   __extensionPropertySet tCacheIndex, "type_id", tId  & "." & pVersion 
 
    __extensionPropertySet tCacheIndex, "author", pAdditionalInfoA["author"]
    __extensionPropertySet tCacheIndex, "title", pAdditionalInfoA["display name"]