Merge pull request #1953 from livecode/merge-develop-9.0-28.03.2018

Merge develop 9.0 28.03.2018

Author: livecodepanos

Toolset/libraries/revdebuggerlibrary.livecodescript

@@ -2071,6 +2071,9 @@ command revDebuggerUpdateScriptEditor pObject, pHandler, pLine, pState, pError
    revGoScriptEditor the name of stack tScriptEditor
 
    if pError is not empty then
+      if the number of items of pError is 1 then
+         put comma & pLine after pError
+      end if
       # OK-2008-07-10 : This needs to be sent in time so that it arrives after the script
       # editor has finished initializing itself.
       send "revSEDisplayExecutionError pError, pObject" to stack tScriptEditor in 0 milliseconds

Toolset/libraries/revidedeveloperextensionlibrary.livecodescript

@@ -383,7 +383,7 @@ on __revIDEDeveloperExtensionDoCreateTestStack pPath, tRectsA, pDetailsA
       create stack "LiveCode Extension Test Window"
       if tRectsA["rect"] is not empty then
          set the rect of stack "LiveCode Extension Test Window" to tRectsA["rect"]
-      else
+      else if tRectsA["loc"] is not empty then
          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

Toolset/libraries/revideextensionlibrary.livecodescript

@@ -362,59 +362,27 @@ private command __extensionDownloadVerify pCacheIndex
    set the itemdel to "."
    if the last item of tExtensionPath is not "lce" then return __extensionError(pCacheIndex,"Could not install extension. The package extension '"&the last item of tExtensionPath&"' Is not valid. Must be 'lce'.")
 
-   # Get initial manifest data needed for loading
-   local tManifestData, tManifestXMLTree
-   put __extensionManifestData(pCacheIndex) into tManifestData
-   put revXMLCreateTree(tManifestData,true,true,false) into tManifestXMLTree
-   
-   # Check the manifest contains a name
-   local tExtensionName
-   put __extensionManifestValueFromTree(tManifestXMLTree, "name") into tExtensionName
+   # Ensure the zip contains the things we expect
+   local tManifestDataA
+   extensionValidateLCEPackage tExtensionPath, tManifestDataA
    if the result is not empty then
-      return __extensionError(pCacheIndex,"Could not install extension. The package manifest must contain a valid name (com.livecode.extensions.<developer_ID>.<extension_name>)")
-   end if
-   __extensionPropertySet pCacheIndex, "name", tExtensionName
-   
-   # Check the manifest contains a version
-   local tExtensionVersion
-   put __extensionManifestValueFromTree(tManifestXMLTree, "version") into tExtensionVersion
-   if the result is not empty then 
-      return __extensionError(pCacheIndex,"Could not install extension. The package manifest must contain a valid version number (1.2.3 - major,minor,maintenance)")
-   end if
-   __extensionPropertySet pCacheIndex, "version", tExtensionVersion
-   
-   # Check the manifest contains an author
-   local tExtensionAuthor
-   put __extensionManifestValueFromTree(tManifestXMLTree, "author") into tExtensionAuthor
-   if the result is not empty then 
-      return __extensionError(pCacheIndex,"Could not install extension. The package manifest must contain an author")
-   end if
-   __extensionPropertySet pCacheIndex, "author", tExtensionAuthor
-   
-   # Check the manifest contains an type
-   local tExtensionType
-   put __extensionManifestValueFromTree(tManifestXMLTree, "type") into tExtensionType
-   if the result is not empty then 
-      return __extensionError(pCacheIndex,"Could not install extension. The package manifest must contain a type")
-   end if
-   __extensionPropertySet pCacheIndex, "type", tExtensionType
-   
-   # Check the manifest contains an title
-   local tExtensionTitle
-   put __extensionManifestValueFromTree(tManifestXMLTree, "title") into tExtensionTitle
-   if the result is not empty then 
-      return __extensionError(pCacheIndex,"Could not install extension. The package manifest must contain a title")
+      return the result
    end if
-   __extensionPropertySet pCacheIndex, "title", tExtensionTitle
 
-   revXMLDeleteTree tManifestXMLTree
+   repeat for each key tKey in tManifestDataA
+      __extensionPropertySet pCacheIndex, tKey, tManifestDataA[tKey]
+   end repeat
 
    # Build the type ID from the name and version
-   __extensionPropertySet pCacheIndex, "type_id", tExtensionName & "." & tExtensionVersion
+   __extensionPropertySet pCacheIndex, "type_id", \
+         tManifestDataA["name"] & "." & tManifestDataA["version"]
 end __extensionDownloadVerify
 
 private command __extensionInstall pCacheIndex, pPackage, pFromStore
    __extensionDownloadVerify pCacheIndex
+   if the result is not empty then
+      throw "Error installing extension" && pPackage & return & the result
+   end if
 
    local tName, tTypeId, tInstallPath
    put __extensionPropertyGet(pCacheIndex, "name") into tName
@@ -497,6 +465,9 @@ end __extensionInstallCopyInterfaceFile
 private command __extensionInstallLoad pCacheIndex, pName, pInstallFolder, pProgress
    local tFolderData
    extensionFindInFolder pInstallFolder, true, false, tFolderData
+   if tFolderData is empty then
+      throw "extension missing from" && pInstallFolder
+   end if
 
    local tDataA
    put tFolderData[pName][pInstallFolder] into tDataA["copies"][1]
@@ -1095,7 +1066,8 @@ private command __revIDELCBExtensionLoad pID, pFolder, pVersion, pStatus, \
    put pAdditionalInfoA["support_files"] into tSupportFiles
    local tLoadOnStartup
    if pError is empty then
-      put revIDEExtensionGetLoadOnStartup(pID) into tLoadOnStartup
+      put pAdditionalInfoA["_ide"] is true or \
+            revIDEExtensionGetLoadOnStartup(pID) into tLoadOnStartup
    end if
    if not pIsStartup or tLoadOnStartup is not false then
       __LoadExtension tCacheIndex, "lcb", pSourceFile, pFolder, pStatus, pError
@@ -1346,34 +1318,6 @@ private function __extensionManifestValueFromTree pTreeID, pProperty
    return tValue for value
 end __extensionManifestValueFromTree
 
-private function __extensionManifestData pCacheIndex
-   # Get the path to the package file
-   local tExtensionPackageFile
-   put __extensionPropertyGet(pCacheIndex, "download_package_path") into tExtensionPackageFile
-   
-   if not there is a file tExtensionPackageFile then return __extensionError(pCacheIndex,"Could not extract manifest because package was not found in downloads folder")
-   
-   # A zip can come compressed with a base folder or without. So work out what the 
-   # root folder is before trying to extract files
-   revZipOpenArchive tExtensionPackageFile, "read"
-   
-   local tZipItems, tZipRoot
-   put revZipEnumerateItems(tExtensionPackageFile) into tZipItems
-   
-   if the last char of line 1 of tZipItems is "/" then
-      put line 1 of tZipItems into tZipRoot
-   else
-      put empty into tZipRoot
-   end if
-   
-   # Extract the package manfiest to a variable to read key data
-   local tManifestData, tManifestXMLTree, tValue
-   revZipExtractItemToVariable tExtensionPackageFile, (tZipRoot & "manifest.xml"), "tManifestData"
-   
-   revZipCloseArchive tExtensionPackageFile
-   return tManifestData
-end __extensionManifestData
-
 function __extensionSampleStacks pID, pFolder
    local tSampleFolder, tSamples, tSampleArray
 

Toolset/libraries/revidelibrary.8.livecodescript

@@ -11876,7 +11876,14 @@ function revIDELookupError pType, pError
       else if tCode is kExternalHandlerErrorCode then
          return "External handler execution error:" && item 4 to -1 of line 1 of pError
       end if
-      return line tCode of the scriptExecutionErrors
+      
+      if tCode is an integer then
+         get line tCode of the scriptExecutionErrors
+         if it is not empty then
+            return it
+         end if
+      end if
+      return tCode
    else if pType is "warning" then
       return empty
    end if

Toolset/palettes/dictionary/behaviors/revdictionarybehavior.livecodescript

@@ -1,4 +1,4 @@
-script "revDictionaryBehavior"
+script "revDictionaryBehavior" with behavior "revPaletteBehavior"
 -- The dictionary starts to hide elements at lower than 992 pixels
 -- *TODO* Tweak the CSS to rearrange things appropriately 
 constant kDictionaryMinWidth = 992
@@ -93,5 +93,11 @@ end showUpgradeOptions
 
 # bug 17819 enable cmd+c in dictionary
 on commandKeyDown pWhich
-   if pWhich is not "C" then pass commandKeyDown
+   if pWhich is not "C" then 
+      if pWhich is "W" then
+         close me
+      else 
+         pass commandKeyDown
+      end if
+   end if
 end commandKeyDown

Toolset/palettes/extension manager/revideextensionmanagerrowbehavior.livecodescript

@@ -124,12 +124,14 @@ private function __MenuActionsForRow pDataA
       put tShow after tActions
    end if
 
-   local tLoadOnStartup
-   put "Load on startup/|Toggle Load" & return into tLoadOnStartup
-   if revIDEExtensionGetLoadOnStartup(pDataA["name"]) is not false then
-      put "!c" before tLoadOnStartup
+   if not pDataA["_ide"] then
+      local tLoadOnStartup
+      put "Load on startup/|Toggle Load" & return into tLoadOnStartup
+      if revIDEExtensionGetLoadOnStartup(pDataA["name"]) is not false then
+         put "!c" before tLoadOnStartup
+      end if
+      put tLoadOnStartup after tActions
    end if
-   put tLoadOnStartup after tActions
 
    local tSampleList
    if pDataA["samples"] is not empty then

Toolset/palettes/revdatagridlibrary/behaviorsdatagridbuttonbehavior.livecodescript

@@ -3560,52 +3560,78 @@ end _table.ScrollColumnIntoView
 
 
 private command _table.LayoutDataArea
-   local theViewRect, theRect, theRootGroup
+   local theViewRect, theRect
    put _WorkingGroupRect(the long ID of me) into theViewRect
    put theViewRect into theRect
-   put the long ID of group "dgHeaderComponents" of me into theRootGroup
 
-   ## Shift all content
-   set the topLeft of theRootGroup to item 1 to 2 of theRect
-   
-   ## Reposition bottom element
-   local theSBWidth
-   if the visible of scrollbar "dgScrollbar" of me then put the width of scrollbar "dgScrollbar" of me into theSBWidth
-   else put the dgProps["scrollbar corner offset"] of me into theSBWidth
-   set the visible of graphic "dgCornerPiece" of group "dgHorizontalComponents" of me to the visible of scrollbar "dgScrollbar" of me
+   local tHeaderComponents, tHorizontalComponents
+   local tVScrollbar, tHScrollbar, tCornerPiece
+   put the long id of group "dgHeaderComponents" of me into tHeaderComponents
+   put the long id of group "dgHorizontalComponents" of me into tHorizontalComponents
+   put the long id of scrollbar "dgScrollbar" of me into tVScrollbar
+   put the long id of scrollbar "dgHScrollbar" of tHorizontalComponents into tHScrollbar
+   put the long id of graphic "dgCornerPiece" of tHorizontalComponents into tCornerPiece
 
-   set the rect of scrollbar "dgHScrollbar" of group "dgHorizontalComponents" of me to \
-         item 1 of theRect, item 4 of theRect - the height of scrollbar "dgHScrollbar" of group "dgHorizontalComponents" of me, \
-         item 3 of theRect - theSBWidth, item 4 of theRect
-   
-   ## Header mask
-   put the bottom of group "dgHeaderMask" of theRootGroup into item 4 of theRect            
-   set the rect of group "dgHeaderMask" of theRootGroup to theRect
+   ## Shift all content
+   set the topLeft of tHeaderComponents to item 1 to 2 of theRect
 
-   ## Define new top/bottom
-   if the visible of theRootGroup then
-      put item 4 of theRect into item 2 of theRect                 
+   if the visible of tHeaderComponents then
+      # Set the rect of the header mask
+      local tHeaderMaskRect
+      put theRect into tHeaderMaskRect
+      put the bottom of group "dgHeaderMask" of tHeaderComponents into item 4 of tHeaderMaskRect            
+      set the rect of group "dgHeaderMask" of tHeaderComponents to tHeaderMaskRect
+      ## Define new top of content rect
+      put item 4 of tHeaderMaskRect into item 2 of theRect                 
    end if
 
-   if the visible of group "dgHorizontalComponents" of me then
-      put the top of scrollbar "dgHScrollbar" of group "dgHorizontalComponents" of me into item 4 of theRect
-   else
-      put item 4 of theViewRect - the dgProps["scrollbar corner offset"] of me into item 4 of theRect
+   if the environment is not "mobile" then
+      ## Reposition bottom element
+      local theSBWidth
+      if the visible of tVScrollbar then 
+         put the width of tVScrollbar into theSBWidth
+      else 
+         put the dgProps["scrollbar corner offset"] of me into theSBWidth
+      end if
+      # If the hscrollbar is not shown, then the horizontal components group
+      # containing it is invisible, so the corner piece is also invisible.
+      # So we can just set visibility of corner piece to the visible of the 
+      # vscrollbar
+      set the visible of tCornerPiece to the visible of tVScrollbar
+      
+      set the rect of tHScrollbar to \
+            item 1 of theRect, \
+            item 4 of theRect - the height of tHScrollbar, \
+            item 3 of theRect - theSBWidth, item 4 of theRect
+      
+      if the visible of tHorizontalComponents then
+         put the top of tHScrollbar into item 4 of theRect
+      else
+         put item 4 of theViewRect - the dgProps["scrollbar corner offset"] of me \
+               into item 4 of theRect
+      end if
+      
+      ## V Scrollbar and corner piece    
+      set the rect of tVScrollbar to \
+            item 3 of theRect - the width of tVScrollbar, \
+            item 2 of theRect, item 3 of theRect, \
+            item 4 of theRect
+      
+      set the rect of tCornerPiece to \
+            item 3 of theRect - the width of tVScrollbar, \
+            the top of tHScrollbar, \
+            item 3 of theRect, \
+            the bottom of tHScrollbar
+      
+      ## Masks
+      ## AL-2013-07-30 [[ Bug 10108 ]]  Thumb and scrollbar appear over top of DataGrid
+      if the visible of tVScrollbar then 
+         put item 3 of theRect - theSBWidth into item 3 of theRect
+      end if
+   else if __HasMobileScroller() then
+      mobileControlSet sScrollerId, "rect", theRect
    end if
 
-   ## V Scrollbar and corner piece    
-   set the rect of scrollbar "dgScrollbar" of me to item 3 of theRect - the width of scrollbar "dgScrollbar" of me, \
-         item 2 of theRect, item 3 of theRect, \
-         item 4 of theRect
-   
-   set the rect of graphic "dgCornerPiece" of group "dgHorizontalComponents" of me to \
-         item 3 of theRect - the width of scrollbar "dgScrollbar" of me, \
-         the top of scrollbar "dgHScrollbar" of group "dgHorizontalComponents" of me, item 3 of theRect, \
-         the bottom of scrollbar "dgHScrollbar" of group "dgHorizontalComponents" of me
-   
-   ## Masks
-   ## AL-2013-07-30 [[ Bug 10108 ]]  Thumb and scrollbar appear over top of DataGrid
-   if the visible of scrollbar "dgScrollbar" of me then put item 3 of theRect - theSBWidth into item 3 of theRect
    set the topLeft of group "dgListMask" of me to item 1 to 2 of theRect
    set the rect of group "dgListMask" of me to theRect
    set the rect of group "dgAlternatingRowsMask" of me to theRect
@@ -10791,7 +10817,7 @@ function DG2_CustomisableControlsGetDefaultEditModeReorderControl
    if there is not a group "DG2 Default Edit Mode Reorder Control"of _TemplateControl() then
       local tMsgsAreLocked
       put the lockMessages into tMsgsAreLocked
-      lock messages
+      unlock messages
 
       reset the templateGroup
       create invisible group "DG2 Default Edit Mode Reorder Control" in _TemplateControl()
@@ -10812,7 +10838,7 @@ function DG2_CustomisableControlsGetDefaultEditModeActionSelectControl
    if there is not a group "DG2 Default Edit Mode Action Select Control" of _TemplateControl() then
       local tMsgsAreLocked
       put the lockMessages into tMsgsAreLocked
-      lock messages
+      unlock messages
 
       reset the templateGroup
       create invisible group "DG2 Default Edit Mode Action Select Control" in _TemplateControl()
@@ -10836,7 +10862,7 @@ function DG2_CustomisableControlsGetDefaultEditModeActionControl
 
       local tMsgsAreLocked
       put the lockMessages into tMsgsAreLocked
-      lock messages
+      unlock messages
 
       reset the templateGroup
       create invisible group "DG2 Default Action Control" in _TemplateControl()
@@ -10866,7 +10892,7 @@ private function DG2_CustomisableControlsGetDefaultSwipeControl pName
 
       local tMsgsAreLocked
       put the lockMessages into tMsgsAreLocked
-      lock messages
+      unlock messages
 
       local tGroup
       reset the templateGroup

Toolset/palettes/script editor/behaviors/revsecommoneditorbehavior.livecodescript

@@ -2992,11 +2992,41 @@ command scriptFormat pScope, pDontGroup
       local tOldText
       put the text of field "Script" of me into tOldText
 
+      local tFirstLine, tLastLine, tCharsAboveFirstLineOld, tCharsAboveLastLineOld
+      get the selectedLine
+      put word 2 of it into tFirstLine
+      if word 4 of it is a number then put word 4 of it into tLastLine else put tFirstLine into tLastLine
+      
+      put the number of chars of line 1 to tFirstLine of tOldText into tCharsAboveFirstLineOld
+      if tFirstLine is tLastLine then
+         put tCharsAboveFirstLineOld into tCharsAboveLastLineOld
+      else
+         put the number of chars of line 1 to tLastLine of tOldText into tCharsAboveLastLineOld
+      end if
+      
       local tNewText
       put textFormatSelection(tOldText) into tNewText
+      
+      local tCharsAboveFirstLineNew, tCharsAboveLastLineNew, tDiffFirstLine, tDiffLastLine
+      put the number of chars of line 1 to tFirstLine of tNewText into tCharsAboveFirstLineNew
+      if tFirstLine is tLastLine then
+         put tCharsAboveFirstLineNew into tCharsAboveLastLineNew
+      else
+         put the number of chars of line 1 to tLastLine of tNewText into tCharsAboveLastLineNew
+      end if
+      
+      put tCharsAboveFirstLineOld - tCharsAboveFirstLineNew into tDiffFirstLine
+      put tCharsAboveLastLineOld - tCharsAboveLastLineNew into tDiffLastLine
+      
+      local tFirstLineChar
+      put (the number of chars of line 1 to tFirstLine - 1 of tNewText) + 1 into tFirstLineChar
+      
       textReplace tStartChar, tOldText, tNewText, empty, pDontGroup
 
       if tStart is not empty then
+         subtract tDiffFirstLine from tStart
+         put max(tStart, tFirstLineChar) into tStart # dont let selection go into previous line
+         subtract tDiffLastLine from tEnd
          select char tStart to tEnd of field "Script" of me
       end if