updates

Author: Brenton Bostick

CHANGELOG.md

@@ -1,5 +1,17 @@
 
-## 1.8 - XX Sep, 2022
+## 1.8 - 10 Oct, 2022
+
+Format `1 / 0` as `1/0`.
+
+Special casing for `Test[input, expected, TestID -> xxx]`.
+
+Prevent palette from becoming blank when removing the last preset.
+
+### Fixes
+
+Fix 427231: CodeFormat on empty quotes throws many errors.
+
+Fix bug where "Save as Present" button is outside the draw area of the palette.
 
 
 ## 1.7 - 4 July, 2022

CodeFormatter/Generate/AcceptableOperators.wl

@@ -92,7 +92,7 @@ EndPackage[]
 "};
 
 Print["exporting AcceptableOperators.wl"];
-res = Export[FileNameJoin[{generatedWLDir, "Kernel", "AcceptableOperators.wl"}], Column[acceptableOperatorsWL], "String"];
+res = Export[FileNameJoin[{buildDir, "paclet", "CodeFormatter", "Kernel", "AcceptableOperators.wl"}], Column[acceptableOperatorsWL], "String"];
 
 Print[res];
 

CodeFormatter/Generate/Palette.wl

@@ -221,7 +221,7 @@ Module[{nb, res},
   ];
 
   Print["saving CodeFormatter.nb"];
-  res = NotebookSave[nb, FileNameJoin[{generatedWLDir, "FrontEnd", "Palettes", "CodeFormatter.nb"}]];
+  res = NotebookSave[nb, FileNameJoin[{buildDir, "paclet", "CodeFormatter", "FrontEnd", "Palettes", "CodeFormatter.nb"}]];
 
   Print[res];
 

CodeTools/Generate/GenerateSources.wl

@@ -10,8 +10,6 @@ srcDir
 
 script
 
-generatedWLDir
-
 pacletFlagPosition
 
 paclet
@@ -48,8 +46,6 @@ scriptPosition = FirstPosition[$CommandLine, "-script"]
 
 script := script = $CommandLine[[scriptPosition[[1]] + 1]]
 
-generatedWLDir = FileNameJoin[{buildDir, "generated", "wl"}]
-
 pacletFlagPosition = FirstPosition[$CommandLine, "-paclet"]
 
 paclet := paclet = $CommandLine[[pacletFlagPosition[[1]] + 1]]

cmake/ReplacePacletInfo.cmake

@@ -17,12 +17,6 @@ if(LOCAL_BUILD)
 
 string(REGEX REPLACE "Version -> \"[0-9\\.]+\"," "Version -> \"${LOCAL_BUILD_VERSION}\"(* local build *)," filedata ${filedata})
 
-#
-# Handle "Documentation" in list of extensions
-# Fails if "Documentation" extension is first in list of extensions
-#
-string(REGEX REPLACE ",\n([ \t]*)\\{\"Documentation\"[a-zA-Z0-9 ->\"/]*\\}(,|)" "\\2\n\\1(* no \"Documentation\" in local build *)" filedata ${filedata})
-
 endif()
 
 file(WRITE ${REPLACED_PACLETINFO} "${filedata}")

cmake/WolframKernel.cmake

@@ -9,7 +9,7 @@ else()
 endif()
 endif()
 
-if(CMAKE_HOST_WIN32 OR CYGWIN)
+if(MSVC)
 	set(WOLFRAMKERNEL_DEFAULT ${MATHEMATICA_INSTALL_DIR}/wolfram.exe)
 	set(WOLFRAMLIBRARY_INCLUDE_DIR_DEFAULT ${MATHEMATICA_INSTALL_DIR}/SystemFiles/IncludeFiles/C)
 	#
@@ -20,9 +20,17 @@ if(CMAKE_HOST_WIN32 OR CYGWIN)
 	# starting in 11.2, the single path for MathLink includes and MathLink libs is:
 	# SystemFiles/Links/MathLink/DeveloperKit/Windows-x86-64/CompilerAdditions
 	#
+	if(EXISTS ${MATHEMATICA_INSTALL_DIR}/SystemFiles/Links/MathLink/DeveloperKit/Windows-x86-64/CompilerAdditions/mldev64/include)
+	set(MATHLINK_INCLUDE_DIR_DEFAULT ${MATHEMATICA_INSTALL_DIR}/SystemFiles/Links/MathLink/DeveloperKit/Windows-x86-64/CompilerAdditions/mldev64/include)
+	else()
 	set(MATHLINK_INCLUDE_DIR_DEFAULT ${MATHEMATICA_INSTALL_DIR}/SystemFiles/Links/MathLink/DeveloperKit/Windows-x86-64/CompilerAdditions)
+	endif()
+	if(EXISTS ${MATHEMATICA_INSTALL_DIR}/SystemFiles/Links/MathLink/DeveloperKit/Windows-x86-64/CompilerAdditions/mldev64/lib)
+	set(MATHLINK_LIB_DIR_DEFAULT ${MATHEMATICA_INSTALL_DIR}/SystemFiles/Links/MathLink/DeveloperKit/Windows-x86-64/CompilerAdditions/mldev64/lib)
+	else()
 	set(MATHLINK_LIB_DIR_DEFAULT ${MATHEMATICA_INSTALL_DIR}/SystemFiles/Links/MathLink/DeveloperKit/Windows-x86-64/CompilerAdditions)
-elseif (CMAKE_HOST_APPLE)
+	endif()
+elseif (APPLE)
 	set(WOLFRAMKERNEL_DEFAULT ${MATHEMATICA_INSTALL_DIR}/MacOS/WolframKernel)
 	set(WOLFRAMLIBRARY_INCLUDE_DIR_DEFAULT ${MATHEMATICA_INSTALL_DIR}/SystemFiles/IncludeFiles/C)
 	set(MATHLINK_INCLUDE_DIR_DEFAULT ${MATHEMATICA_INSTALL_DIR}/SystemFiles/Links/MathLink/DeveloperKit/MacOSX-x86-64/CompilerAdditions)

cmake/WolframScript.cmake

@@ -7,6 +7,16 @@ if(NOT DEFINED RETRY_ON_FAILURE)
 set(RETRY_ON_FAILURE OFF)
 endif()
 
+if(NOT EXISTS ${SCRIPT})
+message(FATAL_ERROR "SCRIPT does not exist. SCRIPT: ${SCRIPT}")
+endif()
+
+file(READ ${SCRIPT} script)
+
+if(script STREQUAL "")
+message(FATAL_ERROR "SCRIPT is empty. SCRIPT: ${SCRIPT}")
+endif()
+
 if(RETRY_ON_FAILURE)
 
 #