Merge pull request #18 from aws/staging_1.83.1

Merge staging_1.83.1 into main

Author: aws-spenceng

.gitignore

@@ -0,0 +1 @@
+.DS_Store

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "vscode"]
+	path = vscode
+	url = https://github.com/microsoft/vscode.git

LICENSE

@@ -1,17 +1,9 @@
-MIT No Attribution
+MIT License
 
 Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 
-Permission is hereby granted, free of charge, to any person obtaining a copy of
-this software and associated documentation files (the "Software"), to deal in
-the Software without restriction, including without limitation the rights to
-use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
-the Software, and to permit persons to whom the Software is furnished to do so.
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including  without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to  the following conditions:
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
-FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
-COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
-IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
 
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN  NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE  SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

README.md

@@ -1,17 +1,23 @@
-## My Project
+## SageMaker Code Editor
 
-TODO: Fill this README out!
+This is the repo for `sagemaker-code-editor`.
 
-Be sure to:
+The `patched-vscode` folder's only usage is to help reviewers review the patch changes. To ease reviewing patches (`.diff` files), whenever we raise a PR for adding/updating a patch, we will also apply the patches to this directory so that this folder's diff shows up in the PR.
 
-* Change the title in this README
-* Edit your repository description on GitHub
+Whenever we create a new branch with `vscode` pointing to a specific commit, this folder must be populated with the same contents as `vscode` at that particular commit.
+
+To properly patch, please follow instructions below:
+
+* Copy resources with the shell script (also in the root directory) by running these commands:
+    - `chmod +x copy-resources.sh`
+    - `./copy-resources.sh`
+* Use `quilt` to apply patches in sequence using `quilt push -a` from the root directory. 
+    - Install quilt in mac - `brew install quilt`
 
 ## Security
 
 See [CONTRIBUTING](CONTRIBUTING.md#security-issue-notifications) for more information.
 
 ## License
 
-This library is licensed under the MIT-0 License. See the LICENSE file.
-
+This library is licensed under the MIT-0 License. See the LICENSE file.

copy-resources.sh

@@ -0,0 +1,45 @@
+#!/bin/bash
+
+# Exit immediately if a command exits with a non-zero status.
+set -ex
+
+# Define the source directory for the resources
+SOURCE_DIR="resources"
+
+# Define the destination base directory
+DEST_DIR="vscode"
+
+# Define paths for each file relative to the base directories
+# Format: "source_file_path:destination_file_path"
+FILES_TO_COPY=(
+    "favicon.ico:resources/server/favicon.ico"
+    "code-icon.svg:src/vs/workbench/browser/media/code-icon.svg"
+    "letterpress-dark.svg:src/vs/workbench/browser/parts/editor/media/letterpress-dark.svg"
+    "letterpress-hcDark.svg:src/vs/workbench/browser/parts/editor/media/letterpress-hcDark.svg"
+    "letterpress-hcLight.svg:src/vs/workbench/browser/parts/editor/media/letterpress-hcLight.svg"
+    "letterpress-light.svg:src/vs/workbench/browser/parts/editor/media/letterpress-light.svg"
+)
+
+# Loop through the file paths, check if file exists, and copy each one to its new location
+for FILE_PATH in "${FILES_TO_COPY[@]}"; do
+    IFS=":" read -r SRC_FILE DEST_FILE <<< "$FILE_PATH"
+    
+    # Construct full source and destination paths
+    FULL_SRC_PATH="$SOURCE_DIR/$SRC_FILE"
+    FULL_DEST_PATH="$DEST_DIR/$DEST_FILE"
+    
+    # Check if the source file exists
+    if [ ! -f "$FULL_SRC_PATH" ]; then
+        echo "Error: Source file $FULL_SRC_PATH does not exist." >&2
+        exit 1
+    fi
+
+    # Check if the destination file exists. If so, delete it before copying.
+    if [ -f "$FULL_DEST_PATH" ]; then
+        rm "$FULL_DEST_PATH"
+        echo "Existing file $FULL_DEST_PATH deleted."
+    fi
+    
+    # Copy file from source to destination
+    cp -v "$FULL_SRC_PATH" "$FULL_DEST_PATH"
+done

patched-vscode/.configurations/configuration.dsc.yaml

@@ -0,0 +1,67 @@
+# yaml-language-server: $schema=https://aka.ms/configuration-dsc-schema/0.2
+# Reference: https://github.com/microsoft/vscode/wiki/How-to-Contribute
+properties:
+  resources:
+    - resource: Microsoft.WinGet.DSC/WinGetPackage
+      directives:
+        description: Install Git
+        allowPrerelease: true
+      settings:
+        id: Git.Git
+        source: winget
+    - resource: Microsoft.WinGet.DSC/WinGetPackage
+      id: npm
+      directives:
+        description: Install NodeJS version >=18.15.x and <19
+        allowPrerelease: true
+      settings:
+        id: OpenJS.NodeJS.LTS
+        version: "18.18.0"
+        source: winget
+    - resource: NpmDsc/NpmPackage
+      id: yarn
+      dependsOn:
+        - npm
+      directives:
+        description: Install Yarn
+        allowPrerelease: true
+      settings:
+        Name: 'yarn'
+        Global: true
+        PackageDirectory: '${WinGetConfigRoot}\..\'
+    - resource: Microsoft.WinGet.DSC/WinGetPackage
+      directives:
+        description: Install Python 3.10
+        allowPrerelease: true
+      settings:
+        id: Python.Python.3.10
+        source: winget
+    - resource: Microsoft.WinGet.DSC/WinGetPackage
+      id: vsPackage
+      directives:
+        description: Install Visual Studio 2022 (any edition is OK)
+        allowPrerelease: true
+      settings:
+        id: Microsoft.VisualStudio.2022.BuildTools
+        source: winget
+    - resource: Microsoft.VisualStudio.DSC/VSComponents
+      dependsOn:
+        - vsPackage
+      directives:
+        description: Install required VS workloads
+        allowPrerelease: true
+      settings:
+        productId: Microsoft.VisualStudio.Product.BuildTools
+        channelId: VisualStudio.17.Release
+        includeRecommended: true
+        components:
+          - Microsoft.VisualStudio.Workload.VCTools
+    - resource: YarnDsc/YarnInstall
+      dependsOn:
+        - npm
+      directives:
+        description: Install dependencies
+        allowPrerelease: true
+      settings:
+        PackageDirectory: '${WinGetConfigRoot}\..\'
+  configurationVersion: 0.2.0

patched-vscode/.devcontainer/Dockerfile

@@ -0,0 +1,12 @@
+FROM mcr.microsoft.com/devcontainers/typescript-node:18-bookworm
+
+ADD install-vscode.sh /root/
+RUN /root/install-vscode.sh
+
+RUN git config --system codespaces-theme.hide-status 1
+
+USER node
+RUN YARN_CACHE="$(yarn cache dir)" && rm -rf "$YARN_CACHE" && ln -s /vscode-dev/yarn-cache "$YARN_CACHE"
+
+USER root
+CMD chown node:node /vscode-dev && sudo -u node mkdir -p /vscode-dev/yarn-cache && sleep inf

patched-vscode/.devcontainer/README.md

@@ -0,0 +1,56 @@
+# Code - OSS Development Container
+
+This dev container includes configuration for a development container for working with Code - OSS in a local container. For using [GitHub Codespaces](https://github.com/features/codespaces) follow the [prebuilt setup](prebuilt/README.md) which installs VNC for displaying the application window.
+
+> **Note:** You will need X11's `DISPLAY` or Wayland's `WAYLAND_DISPLAY` environment variable set locally to allow for the Code - OSS window to display. See [Running GUI app on WSL](https://learn.microsoft.com/en-us/windows/wsl/tutorials/gui-apps) for Windows and [Quartz](https://www.xquartz.org) for Mac.
+
+## Quick start
+
+1. Install Docker Desktop or Docker for Linux on your local machine. (See [docs](https://aka.ms/vscode-remote/containers/getting-started) for additional details.)
+
+2. **Important**: Docker needs at least **4 Cores and 8 GB of RAM** to run a full build with **9 GB of RAM** being recommended. If you are on macOS, or are using the old Hyper-V engine for Windows, update these values for Docker Desktop by right-clicking on the Docker status bar item and going to **Preferences/Settings > Resources > Advanced**.
+
+    > **Note:** The [Resource Monitor](https://marketplace.visualstudio.com/items?itemName=mutantdino.resourcemonitor) extension is included in the container so you can keep an eye on CPU/Memory in the status bar.
+
+3. Install [Visual Studio Code Stable](https://code.visualstudio.com/) or [Insiders](https://code.visualstudio.com/insiders/) and the [Dev Containers](https://aka.ms/vscode-remote/download/containers) extension.
+
+    ![Image of Dev Containers extension](https://microsoft.github.io/vscode-remote-release/images/dev-containers-extn.png)
+
+    > **Note:** The Dev Containers extension requires the Visual Studio Code distribution of Code - OSS. See the [FAQ](https://aka.ms/vscode-remote/faq/license) for details.
+
+4. Due to the size of the repository we strongly recommend cloning it on a Linux filesystem for better bind mount performance. On macOS we recommend using a Docker volume (press <kbd>F1</kbd> and select **Dev Containers: Clone Repository in Container Volume...**) and on Windows we recommend using a WSL folder:
+
+- Make sure you are running a recent WSL version to get X11 and Wayland support.
+- Use the WSL extension for VS Code to open the cloned folder in WSL.
+- Press <kbd>F1</kbd> and select **Dev Containers: Reopen in Container**.
+
+Next: **[Try it out!](#try-it)**
+
+## Try it
+
+To start working with Code - OSS, follow these steps:
+
+1. In your local VS Code client, open a terminal (<kbd>Ctrl/Cmd</kbd> + <kbd>Shift</kbd> + <kbd>\`</kbd>) and type the following commands:
+
+    ```bash
+    yarn install
+    bash scripts/code.sh
+    ```
+
+2. You should now see Code - OSS!
+
+Next, let's try debugging.
+
+1. Shut down Code - OSS by clicking the box in the upper right corner of the Code - OSS window.
+
+2. Go to your local VS Code client, and use the **Run / Debug** view to launch the **VS Code** configuration. (Typically the default, so you can likely just press <kbd>F5</kbd>).
+
+    > **Note:** If launching times out, you can increase the value of `timeout` in the "VS Code", "Attach Main Process", "Attach Extension Host", and "Attach to Shared Process" configurations in [launch.json](../../.vscode/launch.json). However, running `scripts/code.sh` first will set up Electron which will usually solve timeout issues.
+
+3. After a bit, Code - OSS will appear with the debugger attached!
+
+Enjoy!
+
+## Notes
+
+The container comes with VS Code Insiders installed. To run it from an Integrated Terminal use `VSCODE_IPC_HOOK_CLI= /usr/bin/code-insiders .`.

patched-vscode/.devcontainer/devcontainer.json

@@ -0,0 +1,22 @@
+{
+	"name": "Code - OSS with X11/Wayland",
+	"build": {
+		"dockerfile": "Dockerfile"
+	},
+	"overrideCommand": false,
+	"privileged": true,
+	"mounts": [
+		{
+			"source": "vscode-dev",
+			"target": "/vscode-dev",
+			"type": "volume"
+		}
+	],
+	"customizations": {
+		"vscode": {
+			"extensions": [
+				"mutantdino.resourcemonitor"
+			]
+		}
+	}
+}

patched-vscode/.devcontainer/install-vscode.sh

@@ -0,0 +1,12 @@
+#!/bin/sh
+
+apt update
+apt install -y wget gpg
+
+wget -qO- https://packages.microsoft.com/keys/microsoft.asc | gpg --dearmor > packages.microsoft.gpg
+install -D -o root -g root -m 644 packages.microsoft.gpg /etc/apt/keyrings/packages.microsoft.gpg
+sh -c 'echo "deb [arch=amd64,arm64,armhf signed-by=/etc/apt/keyrings/packages.microsoft.gpg] https://packages.microsoft.com/repos/code stable main" > /etc/apt/sources.list.d/vscode.list'
+rm -f packages.microsoft.gpg
+
+apt update
+apt install -y code-insiders libsecret-1-dev libxkbfile-dev libkrb5-dev