Merge branch 'insider'

icons/build_icons.sh

@@ -15,7 +15,7 @@ while getopts ":i" opt; do
   esac
 done
 
-check_programs() {
+check_programs() { # {{{
   for arg in "$@"
   do
     if ! command -v "${arg}" >/dev/null 2>&1
@@ -24,14 +24,30 @@ check_programs() {
       exit
     fi
   done
-}
+} # }}}
 
-check_programs "icns2png" "composite" "convert" "png2icns" "icotool"
+check_programs "icns2png" "composite" "convert" "png2icns" "icotool" "rsvg-convert"
 
 SRC_PREFIX=""
 VSCODE_PREFIX=""
 
-build_darwin_types() {
+build_darwin_main() { # {{{
+  if [ ! -f "${SRC_PREFIX}src/${QUALITY}/resources/darwin/code.icns" ]; then
+    rsvg-convert -w 700 -h 700 "icons/${QUALITY}/codium.svg" -o "code_logo.png"
+    composite "code_logo.png" -geometry +165+190 "icons/template_macos.png" "code_1024.png"
+    convert "code_1024.png" -resize 512x512 code_512.png
+    convert "code_1024.png" -resize 256x256 code_256.png
+    convert "code_1024.png" -resize 128x128 code_128.png
+
+    png2icns "${SRC_PREFIX}src/${QUALITY}/resources/darwin/code.icns" code_512.png code_256.png code_128.png
+
+    rm code_1024.png code_512.png code_256.png code_128.png code_logo.png
+  fi
+} # }}}
+
+build_darwin_types() { # {{{
+  rsvg-convert -w 128 -h 128 "icons/${QUALITY}/codium_border.svg" -o "code_logo.png"
+
   for file in "${VSCODE_PREFIX}"vscode/resources/darwin/*
   do
     if [ -f "${file}" ]; then
@@ -41,7 +57,7 @@ build_darwin_types() {
         icns2png -x -s 512x512 "${file}" -o .
 
         composite -blend 100% -geometry +323+365 "icons/corner_512.png" "${name}_512x512x32.png" "${name}.png"
-        composite "icons/${QUALITY}/code_darwin.png" "${name}.png" "${name}.png"
+        composite -geometry +359+374 "code_logo.png" "${name}.png" "${name}.png"
 
         convert "${name}.png" -resize 256x256 "${name}_256.png"
 
@@ -51,23 +67,35 @@ build_darwin_types() {
       fi
     fi
   done
-}
 
-build_darwin_main() {
-  if [ ! -f "${SRC_PREFIX}src/${QUALITY}/resources/darwin/code.icns" ]; then
-    convert "${SRC_PREFIX}src/${QUALITY}/resources/linux/code.png" -resize 512x512 code_512.png
-    convert "${SRC_PREFIX}src/${QUALITY}/resources/linux/code.png" -resize 256x256 code_256.png
-    convert "${SRC_PREFIX}src/${QUALITY}/resources/linux/code.png" -resize 128x128 code_128.png
+  rm "code_logo.png"
+} # }}}
 
-    png2icns "${SRC_PREFIX}src/${QUALITY}/resources/darwin/code.icns" code_512.png code_256.png code_128.png
+build_linux_main() { # {{{
+  if [ ! -f "${SRC_PREFIX}src/${QUALITY}/resources/linux/code.png" ]; then
+    convert -size 1024x1024 canvas:transparent PNG32:"code_1024.png"
+    rsvg-convert -w 896 -h 896 "icons/${QUALITY}/codium.svg" -o "code_logo.png"
+    composite "code_logo.png" -geometry +75+72 -background none "code_1024.png" "${SRC_PREFIX}src/${QUALITY}/resources/linux/code.png"
+
+    rm code_1024.png code_logo.png
+  fi
 
-    rm code_512.png code_256.png code_128.png
+  if [ ! -f "${SRC_PREFIX}src/${QUALITY}/resources/linux/rpm/code.xpm" ]; then
+    convert "${SRC_PREFIX}src/${QUALITY}/resources/linux/code.png" "${SRC_PREFIX}src/${QUALITY}/resources/linux/rpm/code.xpm"
   fi
-}
+} # }}}
 
-build_win32() {
+build_windows_main() { # {{{
+  if [ ! -f "${SRC_PREFIX}src/${QUALITY}/resources/win32/code.ico" ]; then
+    convert "${SRC_PREFIX}src/${QUALITY}/resources/linux/code.png" -define icon:auto-resize=256,128,96,64,48,32,24,20,16 "${SRC_PREFIX}src/${QUALITY}/resources/win32/code.ico"
+  fi
+} # }}}
+
+build_windows_types() { # {{{
   mkdir -p "${SRC_PREFIX}src/${QUALITY}/resources/win32"
 
+  rsvg-convert -b "#F5F6F7" -w 64 -h 64 "icons/${QUALITY}/codium.svg" -o "code_logo.png"
+
   for file in "${VSCODE_PREFIX}"vscode/resources/win32/*.ico
   do
     if [ -f "${file}" ]; then
@@ -76,88 +104,118 @@ build_win32() {
       if [[ ${name} != 'code' ]] && [ ! -f "${SRC_PREFIX}src/${QUALITY}/resources/win32/${name}.ico" ]; then
         icotool -x -w 256 "${file}"
 
-        composite -geometry +150+185 "icons/${QUALITY}/code_64.png" "${name}_1_256x256x32.png" "${name}.png"
+        composite -geometry +150+185 "code_logo.png" "${name}_9_256x256x32.png" "${name}.png"
 
         convert "${name}.png" -define icon:auto-resize=256,128,96,64,48,32,24,20,16 "${SRC_PREFIX}src/${QUALITY}/resources/win32/${name}.ico"
 
-        rm "${name}_1_256x256x32.png" "${name}.png"
+        rm "${name}_9_256x256x32.png" "${name}.png"
       fi
     fi
   done
 
-  if [ ! -f "${SRC_PREFIX}src/${QUALITY}/resources/win32/code.ico" ]; then
-    convert "${SRC_PREFIX}src/${QUALITY}/resources/linux/code.png" -define icon:auto-resize=256,128,96,64,48,32,24,20,16 "${SRC_PREFIX}src/${QUALITY}/resources/win32/code.ico"
+  if [ ! -f "${SRC_PREFIX}src/${QUALITY}/resources/win32/code_70x70.png" ]; then
+    convert -size 70x70 canvas:transparent PNG32:"${SRC_PREFIX}src/${QUALITY}/resources/win32/code_70x70.png"
+    rsvg-convert -w 45 -h 45 "icons/${QUALITY}/codium.svg" -o "code_logo.png"
+    composite -gravity center "code_logo.png" "${SRC_PREFIX}src/${QUALITY}/resources/win32/code_70x70.png" "${SRC_PREFIX}src/${QUALITY}/resources/win32/code_70x70.png"
+  fi
+
+   if [ ! -f "${SRC_PREFIX}src/${QUALITY}/resources/win32/code_150x150.png" ]; then
+    convert -size 150x150 canvas:transparent PNG32:"${SRC_PREFIX}src/${QUALITY}/resources/win32/code_150x150.png"
+    rsvg-convert -w 64 -h 64 "icons/${QUALITY}/codium.svg" -o "code_logo.png"
+    composite -geometry +44+25 "code_logo.png" "${SRC_PREFIX}src/${QUALITY}/resources/win32/code_150x150.png" "${SRC_PREFIX}src/${QUALITY}/resources/win32/code_150x150.png"
   fi
 
   if [ ! -f "${SRC_PREFIX}src/${QUALITY}/resources/win32/inno-big-100.bmp" ]; then
     convert -size 164x314 xc:white "${SRC_PREFIX}src/${QUALITY}/resources/win32/inno-big-100.bmp"
-    composite -size 126x -gravity center "icons/${QUALITY}/codium_only.svg" "${SRC_PREFIX}src/${QUALITY}/resources/win32/inno-big-100.bmp" "${SRC_PREFIX}src/${QUALITY}/resources/win32/inno-big-100.bmp"
+    rsvg-convert -w 126 -h 126 "icons/${QUALITY}/codium.svg" -o "code_logo.png"
+    composite -gravity center "code_logo.png" "${SRC_PREFIX}src/${QUALITY}/resources/win32/inno-big-100.bmp" "${SRC_PREFIX}src/${QUALITY}/resources/win32/inno-big-100.bmp"
   fi
   if [ ! -f "${SRC_PREFIX}src/${QUALITY}/resources/win32/inno-big-125.bmp" ]; then
     convert -size 192x386 xc:white "${SRC_PREFIX}src/${QUALITY}/resources/win32/inno-big-125.bmp"
-    composite -size 147x -gravity center "icons/${QUALITY}/codium_only.svg" "${SRC_PREFIX}src/${QUALITY}/resources/win32/inno-big-125.bmp" "${SRC_PREFIX}src/${QUALITY}/resources/win32/inno-big-125.bmp"
+    rsvg-convert -w 147 -h 147 "icons/${QUALITY}/codium.svg" -o "code_logo.png"
+    composite -gravity center "code_logo.png" "${SRC_PREFIX}src/${QUALITY}/resources/win32/inno-big-125.bmp" "${SRC_PREFIX}src/${QUALITY}/resources/win32/inno-big-125.bmp"
   fi
   if [ ! -f "${SRC_PREFIX}src/${QUALITY}/resources/win32/inno-big-150.bmp" ]; then
     convert -size 246x459 xc:white "${SRC_PREFIX}src/${QUALITY}/resources/win32/inno-big-150.bmp"
-    composite -size 190x -gravity center "icons/${QUALITY}/codium_only.svg" "${SRC_PREFIX}src/${QUALITY}/resources/win32/inno-big-150.bmp" "${SRC_PREFIX}src/${QUALITY}/resources/win32/inno-big-150.bmp"
+    rsvg-convert -w 190 -h 190 "icons/${QUALITY}/codium.svg" -o "code_logo.png"
+    composite -gravity center "code_logo.png" "${SRC_PREFIX}src/${QUALITY}/resources/win32/inno-big-150.bmp" "${SRC_PREFIX}src/${QUALITY}/resources/win32/inno-big-150.bmp"
   fi
   if [ ! -f "${SRC_PREFIX}src/${QUALITY}/resources/win32/inno-big-175.bmp" ]; then
     convert -size 273x556 xc:white "${SRC_PREFIX}src/${QUALITY}/resources/win32/inno-big-175.bmp"
-    composite -size 211x -gravity center "icons/${QUALITY}/codium_only.svg" "${SRC_PREFIX}src/${QUALITY}/resources/win32/inno-big-175.bmp" "${SRC_PREFIX}src/${QUALITY}/resources/win32/inno-big-175.bmp"
+    rsvg-convert -w 211 -h 211 "icons/${QUALITY}/codium.svg" -o "code_logo.png"
+    composite -gravity center "code_logo.png" "${SRC_PREFIX}src/${QUALITY}/resources/win32/inno-big-175.bmp" "${SRC_PREFIX}src/${QUALITY}/resources/win32/inno-big-175.bmp"
   fi
   if [ ! -f "${SRC_PREFIX}src/${QUALITY}/resources/win32/inno-big-200.bmp" ]; then
     convert -size 328x604 xc:white "${SRC_PREFIX}src/${QUALITY}/resources/win32/inno-big-200.bmp"
-    composite -size 255x -gravity center "icons/${QUALITY}/codium_only.svg" "${SRC_PREFIX}src/${QUALITY}/resources/win32/inno-big-200.bmp" "${SRC_PREFIX}src/${QUALITY}/resources/win32/inno-big-200.bmp"
+    rsvg-convert -w 255 -h 255 "icons/${QUALITY}/codium.svg" -o "code_logo.png"
+    composite -gravity center "code_logo.png" "${SRC_PREFIX}src/${QUALITY}/resources/win32/inno-big-200.bmp" "${SRC_PREFIX}src/${QUALITY}/resources/win32/inno-big-200.bmp"
   fi
   if [ ! -f "${SRC_PREFIX}src/${QUALITY}/resources/win32/inno-big-225.bmp" ]; then
     convert -size 355x700 xc:white "${SRC_PREFIX}src/${QUALITY}/resources/win32/inno-big-225.bmp"
-    composite -size 273x -gravity center "icons/${QUALITY}/codium_only.svg" "${SRC_PREFIX}src/${QUALITY}/resources/win32/inno-big-225.bmp" "${SRC_PREFIX}src/${QUALITY}/resources/win32/inno-big-225.bmp"
+    rsvg-convert -w 273 -h 273 "icons/${QUALITY}/codium.svg" -o "code_logo.png"
+    composite -gravity center "code_logo.png" "${SRC_PREFIX}src/${QUALITY}/resources/win32/inno-big-225.bmp" "${SRC_PREFIX}src/${QUALITY}/resources/win32/inno-big-225.bmp"
   fi
   if [ ! -f "${SRC_PREFIX}src/${QUALITY}/resources/win32/inno-big-250.bmp" ]; then
     convert -size 410x797 xc:white "${SRC_PREFIX}src/${QUALITY}/resources/win32/inno-big-250.bmp"
-    composite -size 317x -gravity center "icons/${QUALITY}/codium_only.svg" "${SRC_PREFIX}src/${QUALITY}/resources/win32/inno-big-250.bmp" "${SRC_PREFIX}src/${QUALITY}/resources/win32/inno-big-250.bmp"
+    rsvg-convert -w 317 -h 317 "icons/${QUALITY}/codium.svg" -o "code_logo.png"
+    composite -gravity center "code_logo.png" "${SRC_PREFIX}src/${QUALITY}/resources/win32/inno-big-250.bmp" "${SRC_PREFIX}src/${QUALITY}/resources/win32/inno-big-250.bmp"
   fi
 
   if [ ! -f "${SRC_PREFIX}src/${QUALITY}/resources/win32/inno-small-100.bmp" ]; then
     convert -size 55x55 xc:white "${SRC_PREFIX}src/${QUALITY}/resources/win32/inno-small-100.bmp"
-    composite -size 44x -gravity center "icons/${QUALITY}/codium_only.svg" "${SRC_PREFIX}src/${QUALITY}/resources/win32/inno-small-100.bmp" "${SRC_PREFIX}src/${QUALITY}/resources/win32/inno-small-100.bmp"
+    rsvg-convert -w 44 -h 44 "icons/${QUALITY}/codium.svg" -o "code_logo.png"
+    composite -gravity center "code_logo.png" "${SRC_PREFIX}src/${QUALITY}/resources/win32/inno-small-100.bmp" "${SRC_PREFIX}src/${QUALITY}/resources/win32/inno-small-100.bmp"
   fi
   if [ ! -f "${SRC_PREFIX}src/${QUALITY}/resources/win32/inno-small-125.bmp" ]; then
     convert -size 64x68 xc:white "${SRC_PREFIX}src/${QUALITY}/resources/win32/inno-small-125.bmp"
-    composite -size 52x -gravity center "icons/${QUALITY}/codium_only.svg" "${SRC_PREFIX}src/${QUALITY}/resources/win32/inno-small-125.bmp" "${SRC_PREFIX}src/${QUALITY}/resources/win32/inno-small-125.bmp"
+    rsvg-convert -w 52 -h 52 "icons/${QUALITY}/codium.svg" -o "code_logo.png"
+    composite -gravity center "code_logo.png" "${SRC_PREFIX}src/${QUALITY}/resources/win32/inno-small-125.bmp" "${SRC_PREFIX}src/${QUALITY}/resources/win32/inno-small-125.bmp"
   fi
   if [ ! -f "${SRC_PREFIX}src/${QUALITY}/resources/win32/inno-small-150.bmp" ]; then
     convert -size 83x80 xc:white "${SRC_PREFIX}src/${QUALITY}/resources/win32/inno-small-150.bmp"
-    composite -size 63x -gravity center "icons/${QUALITY}/codium_only.svg" "${SRC_PREFIX}src/${QUALITY}/resources/win32/inno-small-150.bmp" "${SRC_PREFIX}src/${QUALITY}/resources/win32/inno-small-150.bmp"
+    rsvg-convert -w 63 -h 63 "icons/${QUALITY}/codium.svg" -o "code_logo.png"
+    composite -gravity center "code_logo.png" "${SRC_PREFIX}src/${QUALITY}/resources/win32/inno-small-150.bmp" "${SRC_PREFIX}src/${QUALITY}/resources/win32/inno-small-150.bmp"
   fi
   if [ ! -f "${SRC_PREFIX}src/${QUALITY}/resources/win32/inno-small-175.bmp" ]; then
     convert -size 92x97 xc:white "${SRC_PREFIX}src/${QUALITY}/resources/win32/inno-small-175.bmp"
-    composite -size 76x -gravity center "icons/${QUALITY}/codium_only.svg" "${SRC_PREFIX}src/${QUALITY}/resources/win32/inno-small-175.bmp" "${SRC_PREFIX}src/${QUALITY}/resources/win32/inno-small-175.bmp"
+    rsvg-convert -w 76 -h 76 "icons/${QUALITY}/codium.svg" -o "code_logo.png"
+    composite -gravity center "code_logo.png" "${SRC_PREFIX}src/${QUALITY}/resources/win32/inno-small-175.bmp" "${SRC_PREFIX}src/${QUALITY}/resources/win32/inno-small-175.bmp"
   fi
   if [ ! -f "${SRC_PREFIX}src/${QUALITY}/resources/win32/inno-small-200.bmp" ]; then
     convert -size 110x106 xc:white "${SRC_PREFIX}src/${QUALITY}/resources/win32/inno-small-200.bmp"
-    composite -size 86x -gravity center "icons/${QUALITY}/codium_only.svg" "${SRC_PREFIX}src/${QUALITY}/resources/win32/inno-small-200.bmp" "${SRC_PREFIX}src/${QUALITY}/resources/win32/inno-small-200.bmp"
+    rsvg-convert -w 86 -h 86 "icons/${QUALITY}/codium.svg" -o "code_logo.png"
+    composite -gravity center "code_logo.png" "${SRC_PREFIX}src/${QUALITY}/resources/win32/inno-small-200.bmp" "${SRC_PREFIX}src/${QUALITY}/resources/win32/inno-small-200.bmp"
   fi
   if [ ! -f "${SRC_PREFIX}src/${QUALITY}/resources/win32/inno-small-225.bmp" ]; then
     convert -size 119x123 xc:white "${SRC_PREFIX}src/${QUALITY}/resources/win32/inno-small-225.bmp"
-    composite -size 103x -gravity center "icons/${QUALITY}/codium_only.svg" "${SRC_PREFIX}src/${QUALITY}/resources/win32/inno-small-225.bmp" "${SRC_PREFIX}src/${QUALITY}/resources/win32/inno-small-225.bmp"
+    rsvg-convert -w 103 -h 103 "icons/${QUALITY}/codium.svg" -o "code_logo.png"
+    composite -gravity center "code_logo.png" "${SRC_PREFIX}src/${QUALITY}/resources/win32/inno-small-225.bmp" "${SRC_PREFIX}src/${QUALITY}/resources/win32/inno-small-225.bmp"
   fi
   if [ ! -f "${SRC_PREFIX}src/${QUALITY}/resources/win32/inno-small-250.bmp" ]; then
     convert -size 138x140 xc:white "${SRC_PREFIX}src/${QUALITY}/resources/win32/inno-small-250.bmp"
-    composite -size 116x -gravity center "icons/${QUALITY}/codium_only.svg" "${SRC_PREFIX}src/${QUALITY}/resources/win32/inno-small-250.bmp" "${SRC_PREFIX}src/${QUALITY}/resources/win32/inno-small-250.bmp"
+    rsvg-convert -w 116 -h 116 "icons/${QUALITY}/codium.svg" -o "code_logo.png"
+    composite -gravity center "code_logo.png" "${SRC_PREFIX}src/${QUALITY}/resources/win32/inno-small-250.bmp" "${SRC_PREFIX}src/${QUALITY}/resources/win32/inno-small-250.bmp"
   fi
   if [ ! -f "${SRC_PREFIX}build/windows/msi/resources/${QUALITY}/wix-banner.bmp" ]; then
     convert -size 493x58 xc:white "${SRC_PREFIX}build/windows/msi/resources/${QUALITY}/wix-banner.bmp"
-    composite -geometry +438+6 \( "icons/${QUALITY}/codium_only.svg" -resize 50x50 \) "${SRC_PREFIX}build/windows/msi/resources/${QUALITY}/wix-banner.bmp" "${SRC_PREFIX}build/windows/msi/resources/${QUALITY}/wix-banner.bmp"
+    rsvg-convert -w 50 -h 50 "icons/${QUALITY}/codium.svg" -o "code_logo.png"
+    composite -geometry +438+6 "code_logo.png" "${SRC_PREFIX}build/windows/msi/resources/${QUALITY}/wix-banner.bmp" "${SRC_PREFIX}build/windows/msi/resources/${QUALITY}/wix-banner.bmp"
   fi
   if [ ! -f "${SRC_PREFIX}build/windows/msi/resources/${QUALITY}/wix-dialog.bmp" ]; then
     convert -size 493x312 xc:white "${SRC_PREFIX}build/windows/msi/resources/${QUALITY}/wix-dialog.bmp"
-    composite -geometry +22+152 \( "icons/${QUALITY}/codium_only.svg" -resize 120x90 \) "${SRC_PREFIX}build/windows/msi/resources/${QUALITY}/wix-dialog.bmp" "${SRC_PREFIX}build/windows/msi/resources/${QUALITY}/wix-dialog.bmp"
+    rsvg-convert -w 120 -h 120 "icons/${QUALITY}/codium.svg" -o "code_logo.png"
+    composite -geometry +22+152 "code_logo.png" "${SRC_PREFIX}build/windows/msi/resources/${QUALITY}/wix-dialog.bmp" "${SRC_PREFIX}build/windows/msi/resources/${QUALITY}/wix-dialog.bmp"
   fi
-}
+
+  rm code_logo.png
+} # }}}
 
 if [ "${0}" == "${BASH_SOURCE}" ];
 then
+  build_darwin_main
+  build_linux_main
+  build_windows_main
+
   build_darwin_types
-  build_win32
+  build_windows_types
 fi

icons/insider/codium.svg

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0" y="0" width="100" height="100" viewBox="0, 0, 100, 100">
+  <defs>
+    <linearGradient id="Gradient_1" gradientUnits="userSpaceOnUse" x1="199.997" y1="214.302" x2="296.665" y2="307.573" gradientTransform="matrix(1, 0, 0, 1, -200, -213)">
+      <stop offset="0" stop-color="#FFA348"/>
+      <stop offset="1" stop-color="#C64600"/>
+    </linearGradient>
+  </defs>
+  <g id="Layer_1">
+    <path d="M48.26,2.274 C45.406,4.105 44.583,7.898 46.422,10.742 C56.531,26.397 58.917,38.205 57.882,48.553 C53.698,68.369 44.603,72.389 36.655,72.389 C28.895,72.389 30.973,59.618 36.806,55.88 C40.288,53.706 44.748,52.293 48.171,52.293 C51.563,52.293 54.313,49.552 54.313,46.17 C54.313,42.787 51.563,40.046 48.171,40.046 C44.173,40.046 40.251,40.886 36.59,42.316 C37.338,38.787 37.614,34.973 36.647,30.919 C35.179,24.763 30.953,18.883 23.615,13.183 C22.33,12.183 20.7,11.734 19.083,11.934 C17.466,12.134 15.995,12.966 14.994,14.248 C12.912,16.918 13.394,20.766 16.072,22.843 C22.05,27.486 24.024,30.923 24.699,33.752 C25.374,36.581 24.831,39.616 23.475,43.786 C21.742,49.406 19.73,54.423 18.848,59.234 C18.414,61.602 18.377,64.179 18.265,66.238 C13.96,62.042 12.275,56.502 12.275,48.407 C12.274,45.025 9.524,42.283 6.133,42.284 C2.744,42.287 -0.002,45.027 -0.003,48.407 C-0.003,59.463 3.23,69.983 11.895,77.001 C19.739,84.474 39.686,81.712 39.686,93.709 C39.686,97.095 44.642,98.743 48.033,98.743 C51.511,98.743 55.888,96.418 55.888,93.709 C55.888,80.097 70.233,71.824 93.848,71.86 C97.24,71.865 99.992,69.126 99.997,65.744 C100.003,62.361 97.259,59.614 93.867,59.608 C92.252,59.606 90.678,59.661 89.126,59.753 C91.766,53.544 92.937,46.708 92.695,39.324 C92.583,35.943 89.745,33.293 86.356,33.403 C82.963,33.513 80.305,36.346 80.416,39.729 C80.736,49.397 80.374,58.03 73.171,62.581 C71.123,63.874 68.742,64.996 66.484,64.996 C68.237,60.228 69.561,55.195 70.103,49.77 C70.449,46.308 70.486,42.195 70.091,39 C69.478,34.05 68.738,28.436 70.617,24.207 C72.305,20.565 76.087,19.04 81.64,19.04 C85.029,19.037 87.775,16.296 87.776,12.917 C87.778,9.534 85.031,6.79 81.64,6.787 C73.388,6.787 67.133,11.13 63.587,16.377 C61.733,12.417 59.475,8.336 56.747,4.112 C55.866,2.747 54.478,1.788 52.887,1.443 C52.099,1.272 51.285,1.257 50.491,1.399 C49.697,1.542 48.939,1.839 48.26,2.274 z" fill="url(#Gradient_1)" id="path6008"/>
+  </g>
+</svg>

icons/stable/codium.svg

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0" y="0" width="100" height="100" viewBox="0, 0, 100, 100">
+  <defs>
+    <linearGradient id="Gradient_1" gradientUnits="userSpaceOnUse" x1="199.997" y1="214.302" x2="296.665" y2="307.573" gradientTransform="matrix(1, 0, 0, 1, -200, -213)">
+      <stop offset="0" stop-color="#62A0EA"/>
+      <stop offset="1" stop-color="#1A5FB4"/>
+    </linearGradient>
+  </defs>
+  <g id="Layer_1">
+    <path d="M48.26,2.274 C45.406,4.105 44.583,7.898 46.422,10.742 C56.531,26.397 58.917,38.205 57.882,48.553 C53.698,68.369 44.603,72.389 36.655,72.389 C28.895,72.389 30.973,59.618 36.806,55.88 C40.288,53.706 44.748,52.293 48.171,52.293 C51.563,52.293 54.313,49.552 54.313,46.17 C54.313,42.787 51.563,40.046 48.171,40.046 C44.173,40.046 40.251,40.886 36.59,42.316 C37.338,38.787 37.614,34.973 36.647,30.919 C35.179,24.763 30.953,18.883 23.615,13.183 C22.33,12.183 20.7,11.734 19.083,11.934 C17.466,12.134 15.995,12.966 14.994,14.248 C12.912,16.918 13.394,20.766 16.072,22.843 C22.05,27.486 24.024,30.923 24.699,33.752 C25.374,36.581 24.831,39.616 23.475,43.786 C21.742,49.406 19.73,54.423 18.848,59.234 C18.414,61.602 18.377,64.179 18.265,66.238 C13.96,62.042 12.275,56.502 12.275,48.407 C12.274,45.025 9.524,42.283 6.133,42.284 C2.744,42.287 -0.002,45.027 -0.003,48.407 C-0.003,59.463 3.23,69.983 11.895,77.001 C19.739,84.474 39.686,81.712 39.686,93.709 C39.686,97.095 44.642,98.743 48.033,98.743 C51.511,98.743 55.888,96.418 55.888,93.709 C55.888,80.097 70.233,71.824 93.848,71.86 C97.24,71.865 99.992,69.126 99.997,65.744 C100.003,62.361 97.259,59.614 93.867,59.608 C92.252,59.606 90.678,59.661 89.126,59.753 C91.766,53.544 92.937,46.708 92.695,39.324 C92.583,35.943 89.745,33.293 86.356,33.403 C82.963,33.513 80.305,36.346 80.416,39.729 C80.736,49.397 80.374,58.03 73.171,62.581 C71.123,63.874 68.742,64.996 66.484,64.996 C68.237,60.228 69.561,55.195 70.103,49.77 C70.449,46.308 70.486,42.195 70.091,39 C69.478,34.05 68.738,28.436 70.617,24.207 C72.305,20.565 76.087,19.04 81.64,19.04 C85.029,19.037 87.775,16.296 87.776,12.917 C87.778,9.534 85.031,6.79 81.64,6.787 C73.388,6.787 67.133,11.13 63.587,16.377 C61.733,12.417 59.475,8.336 56.747,4.112 C55.866,2.747 54.478,1.788 52.887,1.443 C52.099,1.272 51.285,1.257 50.491,1.399 C49.697,1.542 48.939,1.839 48.26,2.274 z" fill="url(#Gradient_1)" id="path6008"/>
+  </g>
+</svg>

insider.json

@@ -1,4 +1,4 @@
 {
-  "tag": "1.75.0",
-  "commit": "e2816fe719a4026ffa1ee0189dc89bdfdbafb164"
+  "tag": "1.78.0",
+  "commit": "f31dffc7f9b93a1cdef21243ec30dea7d489a615"
 }

patches/feat-announcements.patch

@@ -1,8 +1,8 @@
 diff --git a/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStarted.contribution.ts b/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStarted.contribution.ts
-index 2c18fde..e1031dd 100644
+index 3ef5ca1..a634a9f 100644
 --- a/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStarted.contribution.ts
 +++ b/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStarted.contribution.ts
-@@ -312,2 +312,8 @@ configurationRegistry.registerConfiguration({
+@@ -301,2 +301,8 @@ configurationRegistry.registerConfiguration({
  		},
 +		'workbench.welcomePage.extraAnnouncements': {
 +			scope: ConfigurationScope.MACHINE,
@@ -12,10 +12,10 @@ index 2c18fde..e1031dd 100644
 +		},
  		'workbench.startupEditor': {
 diff --git a/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStarted.ts b/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStarted.ts
-index 9564618..eb8adfe 100644
+index 46949b2..174e65f 100644
 --- a/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStarted.ts
 +++ b/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStarted.ts
-@@ -116,4 +116,8 @@ type GettingStartedActionEvent = {
+@@ -118,4 +118,8 @@ type GettingStartedActionEvent = {
  type RecentEntry = (IRecentFolder | IRecentWorkspace) & { id: string };
 +type AnnouncementEntry = { id: string, title: string, url: string };
  
@@ -24,30 +24,26 @@ index 9564618..eb8adfe 100644
 +const BUILTIN_ANNOUNCEMENTS: AnnouncementEntry[] = [/* BUILTIN_ANNOUNCEMENTS */];
 +
  export class GettingStartedPage extends EditorPane {
-@@ -148,2 +152,4 @@ export class GettingStartedPage extends EditorPane {
+@@ -152,2 +156,4 @@ export class GettingStartedPage extends EditorPane {
  	private gettingStartedList?: GettingStartedIndexList<IResolvedWalkthrough>;
 +	private announcementList?: GettingStartedIndexList<AnnouncementEntry>;
 +	private announcementData?: AnnouncementEntry[];
- 
-@@ -760,3 +766,2 @@ export class GettingStartedPage extends EditorPane {
- 
--
- 		const leftColumn = $('.categories-column.categories-column-left', {},);
-@@ -767,2 +772,3 @@ export class GettingStartedPage extends EditorPane {
+ 	private featuredExtensionsList?: GettingStartedIndexList<IFeaturedExtension>;
+@@ -804,2 +810,3 @@ export class GettingStartedPage extends EditorPane {
  		const gettingStartedList = this.buildGettingStartedWalkthroughsList();
 +		const announcementList = await this.buildAnnouncementList();
  
-@@ -777,3 +783,3 @@ export class GettingStartedPage extends EditorPane {
+@@ -815,3 +822,3 @@ export class GettingStartedPage extends EditorPane {
  				this.container.classList.remove('noWalkthroughs');
 -				reset(leftColumn, startList.getDomElement(), recentList.getDomElement());
 +				reset(leftColumn, startList.getDomElement(), recentList.getDomElement(), announcementList.getDomElement());
- 				reset(rightColumn, gettingStartedList.getDomElement());
-@@ -783,3 +789,3 @@ export class GettingStartedPage extends EditorPane {
+ 				reset(rightColumn, featuredExtensionList.getDomElement(), gettingStartedList.getDomElement());
+@@ -820,3 +827,3 @@ export class GettingStartedPage extends EditorPane {
  				this.container.classList.add('noWalkthroughs');
--				reset(leftColumn, startList.getDomElement());
+-				reset(leftColumn, startList.getDomElement(), recentList.getDomElement());
 +				reset(leftColumn, startList.getDomElement(), announcementList.getDomElement());
- 				reset(rightColumn, recentList.getDomElement());
-@@ -930,2 +936,51 @@ export class GettingStartedPage extends EditorPane {
+ 				reset(rightColumn, featuredExtensionList.getDomElement());
+@@ -982,2 +989,51 @@ export class GettingStartedPage extends EditorPane {
  
 +	private async buildAnnouncementList(): Promise<GettingStartedIndexList<AnnouncementEntry>> {
 +		const renderAnnouncement = (announcement: AnnouncementEntry) => {

patches/insider/add-remote-url.patch

@@ -1,23 +1,18 @@
-diff --git a/src/vs/workbench/contrib/remote/browser/remote.contribution.ts b/src/vs/workbench/contrib/remote/browser/remote.contribution.ts
-index 63e7f2d..e9a6b7d 100644
---- a/src/vs/workbench/contrib/remote/browser/remote.contribution.ts
-+++ b/src/vs/workbench/contrib/remote/browser/remote.contribution.ts
-@@ -13,2 +13,4 @@ import { RemoteStatusIndicator } from 'vs/workbench/contrib/remote/browser/remot
- import { AutomaticPortForwarding, ForwardedPortsView, PortRestore } from 'vs/workbench/contrib/remote/browser/remoteExplorer';
-+import { CommandsRegistry } from 'vs/platform/commands/common/commands';
-+import { localize } from 'vs/nls';
+diff --git a/build/gulpfile.reh.js b/build/gulpfile.reh.js
+index ae33cc9..06c2a67 100644
+--- a/build/gulpfile.reh.js
++++ b/build/gulpfile.reh.js
+@@ -251,3 +251,3 @@ function packageTask(type, platform, arch, sourceFolderName, destinationFolderNa
+ 		const productJsonStream = gulp.src(['product.json'], { base: '.' })
+-			.pipe(json({ commit, date, version, release }));
++			.pipe(json({ commit, date, version, release, serverDownloadUrlTemplate: 'https://github.com/VSCodium/vscodium-insiders/releases/download/${version}.${release}-insider/vscodium-reh-${os}-${arch}-${version}.${release}-insider.tar.gz' }));
+ 
+diff --git a/build/gulpfile.vscode.js b/build/gulpfile.vscode.js
+index 938943d..2d84a15 100644
+--- a/build/gulpfile.vscode.js
++++ b/build/gulpfile.vscode.js
+@@ -245,3 +245,3 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op
+ 		const date = new Date().toISOString();
+-		const productJsonUpdate = { commit, date, checksums, version, release };
++		const productJsonUpdate = { commit, date, checksums, version, release, serverDownloadUrlTemplate: 'https://github.com/VSCodium/vscodium-insiders/releases/download/${version}.${release}-insider/vscodium-reh-${os}-${arch}-${version}.${release}-insider.tar.gz' };
  
-@@ -23 +25,13 @@ workbenchContributionsRegistry.registerWorkbenchContribution(AutomaticPortForwar
- workbenchContributionsRegistry.registerWorkbenchContribution(RemoteMarkers, LifecyclePhase.Eventually);
-+
-+CommandsRegistry.registerCommand({
-+	id: 'remote.serverDownloadUrlTemplate',
-+	description: {
-+		description: localize('remote.serverDownloadUrlTemplate', 'Provides the url template to download the server archive'),
-+		args: [],
-+		returns: 'string',
-+	},
-+	handler: async (_) => {
-+		return 'https://github.com/VSCodium/vscodium-insiders/releases/download/${version}.${release}-insider/vscodium-reh-${os}-${arch}-${version}.${release}-insider.tar.gz';
-+	}
-+});

patches/remove-mangle.patch

@@ -1,18 +1,18 @@
 diff --git a/build/lib/compilation.js b/build/lib/compilation.js
-index 8449e98..72424b8 100644
+index 63ddeb2..31d2f35 100644
 --- a/build/lib/compilation.js
 +++ b/build/lib/compilation.js
 @@ -21,3 +21,2 @@ const File = require("vinyl");
  const task = require("./task");
 -const mangleTypeScript_1 = require("./mangleTypeScript");
  const watch = require('./watch');
-@@ -104,24 +103,3 @@ function compileTask(src, out, build) {
+@@ -104,24 +103,3 @@ function compileTask(src, out, build, options = {}) {
          }
 -        // mangle: TypeScript to TypeScript
 -        let mangleStream = es.through();
--        if (build) {
+-        if (build && !options.disableMangle) {
 -            let ts2tsMangler = new mangleTypeScript_1.Mangler(compile.projectPath, (...data) => fancyLog(ansiColors.blue('[mangler]'), ...data));
--            const newContentsByFileName = ts2tsMangler.computeNewFileContents();
+-            const newContentsByFileName = ts2tsMangler.computeNewFileContents(new Set(['saveState']));
 -            mangleStream = es.through(function write(data) {
 -                const tsNormalPath = ts.normalizePath(data.path);
 -                const newContents = newContentsByFileName.get(tsNormalPath);
@@ -32,7 +32,7 @@ index 8449e98..72424b8 100644
 -            .pipe(mangleStream)
              .pipe(generator.stream)
 diff --git a/build/lib/compilation.ts b/build/lib/compilation.ts
-index 8e2f7bf..27ea44c 100644
+index d5cd196..afe16d3 100644
 --- a/build/lib/compilation.ts
 +++ b/build/lib/compilation.ts
 @@ -19,4 +19,2 @@ import * as File from 'vinyl';
@@ -40,13 +40,13 @@ index 8e2f7bf..27ea44c 100644
 -import { Mangler } from './mangleTypeScript';
 -import { RawSourceMap } from 'source-map';
  const watch = require('./watch');
-@@ -123,26 +121,3 @@ export function compileTask(src: string, out: string, build: boolean): () => Nod
+@@ -123,26 +121,3 @@ export function compileTask(src: string, out: string, build: boolean, options: {
  
 -		// mangle: TypeScript to TypeScript
 -		let mangleStream = es.through();
--		if (build) {
+-		if (build && !options.disableMangle) {
 -			let ts2tsMangler = new Mangler(compile.projectPath, (...data) => fancyLog(ansiColors.blue('[mangler]'), ...data));
--			const newContentsByFileName = ts2tsMangler.computeNewFileContents();
+-			const newContentsByFileName = ts2tsMangler.computeNewFileContents(new Set(['saveState']));
 -			mangleStream = es.through(function write(data: File & { sourceMap?: RawSourceMap }) {
 -				type TypeScriptExt = typeof ts & { normalizePath(path: string): string };
 -				const tsNormalPath = (<TypeScriptExt>ts).normalizePath(data.path);

prepare_vscode.sh

@@ -103,6 +103,7 @@ setpath "product" "twitterUrl" "https://go.microsoft.com/fwlink/?LinkID=533687"
 
 if [[ "${DISABLE_UPDATE}" != "yes" ]]; then
   setpath "product" "updateUrl" "https://vscodium.now.sh"
+  setpath "product" "downloadUrl" "https://github.com/VSCodium/vscodium/releases"
 fi
 
 if [[ "${VSCODE_QUALITY}" == "insider" ]]; then

product.json

@@ -56,6 +56,7 @@
     ],
     "ms-vsliveshare.vsliveshare": [
       "contribMenuBarHome",
+      "contribShareMenu",
       "diffCommand",
       "documentFiltersExclusive",
       "fileSearchProvider",
@@ -76,6 +77,7 @@
       "resolvers"
     ],
     "ms-python.python": [
+      "contribEditorContentMenu",
       "quickPickSortByLabel",
       "testObserver",
       "envShellEvent"
@@ -100,6 +102,8 @@
       "textSearchProvider"
     ],
     "ms-vscode.remote-repositories": [
+      "contribEditorLineNumberMenu",
+      "contribEditorGutterMenu",
       "contribEditSessions",
       "contribRemoteHelp",
       "contribMenuBarHome",
@@ -133,7 +137,8 @@
       "telemetry"
     ],
     "ms-vscode.remote-server": [
-      "resolvers"
+      "resolvers",
+      "tunnels"
     ],
     "ms-vscode.remote-explorer": [
       "contribRemoteHelp",
@@ -159,6 +164,8 @@
       "documentFiltersExclusive"
     ],
     "GitHub.vscode-pull-request-github": [
+      "contribEditorLineNumberMenu",
+      "contribEditorGutterMenu",
       "contribCommentThreadAdditionalMenu",
       "tokenInformation",
       "contribShareMenu",
@@ -170,10 +177,12 @@
       "quickDiffProvider"
     ],
     "GitHub.copilot": [
-      "inlineCompletionsAdditions"
+      "inlineCompletionsAdditions",
+      "interactive"
     ],
     "GitHub.copilot-nightly": [
-      "inlineCompletionsAdditions"
+      "inlineCompletionsAdditions",
+      "interactive"
     ],
     "GitHub.remotehub": [
       "contribRemoteHelp",
@@ -210,7 +219,8 @@
       "notebookKernelSource",
       "interactiveWindow",
       "notebookControllerAffinityHidden",
-      "contribNotebookStaticPreloads"
+      "contribNotebookStaticPreloads",
+      "quickPickItemTooltip"
     ],
     "dbaeumer.vscode-eslint": [
       "notebookCellExecutionState"
@@ -230,6 +240,9 @@
     "redhat.java": [
       "documentPaste"
     ],
+    "ms-dotnettools.visual-studio-green": [
+      "inlineCompletionsAdditions"
+    ],
     "jeanp413.open-remote-ssh": [
       "resolvers",
       "tunnels",