Default cell language for native notebooks

.github/workflows/pr_datascience.yml

@@ -32,7 +32,7 @@ jobs:
         # We're not running CI on macOS for now because it's one less matrix entry to lower the number of runners used,
         # macOS runners are expensive, and we assume that Ubuntu is enough to cover the UNIX case.
         os: [ubuntu-latest]
-        python: [3.8] 
+        python: [3.8]
         test-suite: [group1, group2, group3, group4]
     steps:
       - name: Checkout
@@ -149,8 +149,305 @@ jobs:
       - name: Publish Test Report
         uses: scacap/action-surefire-report@v1
         with:
-          github_token: ${{ secrets.GITHUB_TOKEN }}       
-          report_paths: ${{ env.TEST_RESULTS_GLOB }} 
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+          report_paths: ${{ env.TEST_RESULTS_GLOB }}
           check_name: Functional Test Report
         if: steps.test_functional_group.outcome == 'failure' && failure()
 
+  testsInVSCode:
+    name: Tests in VS Code
+    runs-on: ${{ matrix.os }}
+    if: github.repository == 'microsoft/vscode-python'
+    strategy:
+      fail-fast: false
+      matrix:
+        # We're not running CI on macOS for now because it's one less matrix entry to lower the number of runners used,
+        # macOS runners are expensive, and we assume that Ubuntu is enough to cover the UNIX case.
+        os: [ubuntu-latest]
+        python: [3.8]
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+
+      - name: Use Python ${{matrix.python}}
+        uses: actions/setup-python@v2
+        with:
+          python-version: ${{matrix.python}}
+
+      - name: Upgrade pip
+        run: python -m pip install -U pip
+
+      - name: Use Node ${{env.NODE_VERSION}}
+        uses: actions/[email protected]
+        with:
+          node-version: ${{env.NODE_VERSION}}
+
+      # Start caching
+
+      # Cache Python Dependencies.
+      # Caching (https://github.com/actions/cache/blob/main/examples.md#python---pip
+      - name: Cache pip on linux
+        uses: actions/cache@v2
+        if: matrix.os == 'ubuntu-latest'
+        with:
+          path: ~/.cache/pip
+          key: ${{ runner.os }}-pip-${{env.PYTHON_VERSION}}-${{ hashFiles('requirements.txt') }}-${{hashFiles('build/debugger-install-requirements.txt')}}-${{hashFiles('test-requirements.txt')}}-${{hashFiles('ipython-test-requirements.txt')}}-${{hashFiles('functional-test-requirements.txt')}}-${{hashFiles('conda-functional-requirements.txt')}}
+          restore-keys: |
+            ${{ runner.os }}-pip-${{env.PYTHON_VERSION}}-
+
+      - name: Cache pip on mac
+        uses: actions/cache@v2
+        if: matrix.os == 'macos-latest'
+        with:
+          path: ~/Library/Caches/pip
+          key: ${{ runner.os }}-pip-${{env.PYTHON_VERSION}}-${{ hashFiles('requirements.txt') }}-${{hashFiles('build/debugger-install-requirements.txt')}}-${{hashFiles('test-requirements.txt')}}-${{hashFiles('ipython-test-requirements.txt')}}-${{hashFiles('functional-test-requirements.txt')}}-${{hashFiles('conda-functional-requirements.txt')}}
+          restore-keys: |
+            ${{ runner.os }}-pip-${{env.PYTHON_VERSION}}-
+
+      - name: Cache pip on windows
+        uses: actions/cache@v2
+        if: matrix.os == 'windows-latest'
+        with:
+          path: ~\AppData\Local\pip\Cache
+          key: ${{ runner.os }}-pip-${{env.PYTHON_VERSION}}-${{ hashFiles('requirements.txt') }}-${{hashFiles('build/debugger-install-requirements.txt')}}-${{hashFiles('test-requirements.txt')}}-${{hashFiles('ipython-test-requirements.txt')}}-${{hashFiles('functional-test-requirements.txt')}}-${{hashFiles('conda-functional-requirements.txt')}}
+          restore-keys: |
+            ${{ runner.os }}-pip-${{env.PYTHON_VERSION}}-
+
+      # Caching of npm packages (https://github.com/actions/cache/blob/main/examples.md#node---npm)
+      - name: Cache npm on linux/mac
+        uses: actions/cache@v2
+        if: matrix.os != 'windows-latest'
+        with:
+          path: ~/.npm
+          key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
+          restore-keys: |
+            ${{ runner.os }}-node-
+
+      - name: Get npm cache directory
+        if: matrix.os == 'windows-latest'
+        id: npm-cache
+        run: |
+          echo "::set-output name=dir::$(npm config get cache)"
+      - name: Cache npm on windows
+        uses: actions/cache@v2
+        if: matrix.os == 'windows-latest'
+        with:
+          path: ${{ steps.npm-cache.outputs.dir }}
+          key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
+          restore-keys: |
+            ${{ runner.os }}-node-
+
+      - name: Cache compiled TS files
+        id: out-cache
+        uses: actions/cache@v2
+        with:
+          path: ./out
+          key: ${{runner.os}}-${{env.CACHE_OUT_DIRECTORY}}-${{hashFiles('src/**')}}
+
+      # For faster/better builds of sdists.
+      - run: python -m pip install wheel
+        shell: bash
+
+      # debugpy is not shipped, only installed for local tests.
+      # In production, we get debugpy from python extension.
+      - name: Install functional test requirements
+        run: |
+          python -m pip --disable-pip-version-check install -t ./pythonFiles/lib/python --no-cache-dir --implementation py --no-deps --upgrade -r ./requirements.txt
+          python -m pip --disable-pip-version-check install -r build/debugger-install-requirements.txt
+          python ./pythonFiles/install_debugpy.py
+          python -m pip install numpy
+          python -m pip install --upgrade jupyter
+          python -m pip install --upgrade -r build/test-requirements.txt
+          python -m pip install --upgrade -r ./build/ipython-test-requirements.txt
+          python -m pip install --upgrade -r ./build/conda-functional-requirements.txt
+          python -m ipykernel install --user
+        # This step is slow.
+
+      - name: Install dependencies (npm ci)
+        run: npm ci --prefer-offline
+        # This step is slow.
+
+      - name: Compile if not cached
+        run: npx gulp prePublishNonBundle
+
+
+      - name: Install Julia
+        uses: julia-actions/setup-julia@v1
+        with:
+          version: 1.5.2
+
+      - name: Install Jualia Kernel
+        run: |
+          julia -e '
+            using Pkg
+            Pkg.add("IJulia")'
+
+      - name: Run VSCode tests
+        uses: GabrielBB/[email protected]
+        with:
+          run: npm run testDataScienceInVSCode
+        env:
+          DISPLAY: 10
+          VSCODE_PYTHON_ROLLING: 1
+          VSC_PYTHON_FORCE_LOGGING: 1
+          VSC_PYTHON_CI_NON_PYTHON_NB_TEST: 1
+          VSC_PYTHON_LOAD_EXPERIMENTS_FROM_FILE: 'true'
+        id: test_functional
+
+      - name: Publish Test Report
+        uses: scacap/action-surefire-report@v1
+        with:
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+          report_paths: ${{ env.TEST_RESULTS_GLOB }}
+          check_name: VSCode Test Report
+        if: steps.test_functional.outcome == 'failure' && failure()
+
+
+#   testsInVSCodeInsiders:
+#     name: Tests in VS Code Insiders
+#     runs-on: ${{ matrix.os }}
+#     if: github.repository == 'microsoft/vscode-python'
+#     strategy:
+#       fail-fast: false
+#       matrix:
+#         # We're not running CI on macOS for now because it's one less matrix entry to lower the number of runners used,
+#         # macOS runners are expensive, and we assume that Ubuntu is enough to cover the UNIX case.
+#         os: [ubuntu-latest]
+#         python: [3.8]
+#     steps:
+#       - name: Checkout
+#         uses: actions/checkout@v2
+
+#       - name: Use Python ${{matrix.python}}
+#         uses: actions/setup-python@v2
+#         with:
+#           python-version: ${{matrix.python}}
+
+#       - name: Upgrade pip
+#         run: python -m pip install -U pip
+
+#       - name: Use Node ${{env.NODE_VERSION}}
+#         uses: actions/[email protected]
+#         with:
+#           node-version: ${{env.NODE_VERSION}}
+
+#       # Start caching
+
+#       # Cache Python Dependencies.
+#       # Caching (https://github.com/actions/cache/blob/main/examples.md#python---pip
+#       - name: Cache pip on linux
+#         uses: actions/cache@v2
+#         if: matrix.os == 'ubuntu-latest'
+#         with:
+#           path: ~/.cache/pip
+#           key: ${{ runner.os }}-pip-${{env.PYTHON_VERSION}}-${{ hashFiles('requirements.txt') }}-${{hashFiles('build/debugger-install-requirements.txt')}}-${{hashFiles('test-requirements.txt')}}-${{hashFiles('ipython-test-requirements.txt')}}-${{hashFiles('functional-test-requirements.txt')}}-${{hashFiles('conda-functional-requirements.txt')}}
+#           restore-keys: |
+#             ${{ runner.os }}-pip-${{env.PYTHON_VERSION}}-
+
+#       - name: Cache pip on mac
+#         uses: actions/cache@v2
+#         if: matrix.os == 'macos-latest'
+#         with:
+#           path: ~/Library/Caches/pip
+#           key: ${{ runner.os }}-pip-${{env.PYTHON_VERSION}}-${{ hashFiles('requirements.txt') }}-${{hashFiles('build/debugger-install-requirements.txt')}}-${{hashFiles('test-requirements.txt')}}-${{hashFiles('ipython-test-requirements.txt')}}-${{hashFiles('functional-test-requirements.txt')}}-${{hashFiles('conda-functional-requirements.txt')}}
+#           restore-keys: |
+#             ${{ runner.os }}-pip-${{env.PYTHON_VERSION}}-
+
+#       - name: Cache pip on windows
+#         uses: actions/cache@v2
+#         if: matrix.os == 'windows-latest'
+#         with:
+#           path: ~\AppData\Local\pip\Cache
+#           key: ${{ runner.os }}-pip-${{env.PYTHON_VERSION}}-${{ hashFiles('requirements.txt') }}-${{hashFiles('build/debugger-install-requirements.txt')}}-${{hashFiles('test-requirements.txt')}}-${{hashFiles('ipython-test-requirements.txt')}}-${{hashFiles('functional-test-requirements.txt')}}-${{hashFiles('conda-functional-requirements.txt')}}
+#           restore-keys: |
+#             ${{ runner.os }}-pip-${{env.PYTHON_VERSION}}-
+
+#       # Caching of npm packages (https://github.com/actions/cache/blob/main/examples.md#node---npm)
+#       - name: Cache npm on linux/mac
+#         uses: actions/cache@v2
+#         if: matrix.os != 'windows-latest'
+#         with:
+#           path: ~/.npm
+#           key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
+#           restore-keys: |
+#             ${{ runner.os }}-node-
+
+#       - name: Get npm cache directory
+#         if: matrix.os == 'windows-latest'
+#         id: npm-cache
+#         run: |
+#           echo "::set-output name=dir::$(npm config get cache)"
+#       - name: Cache npm on windows
+#         uses: actions/cache@v2
+#         if: matrix.os == 'windows-latest'
+#         with:
+#           path: ${{ steps.npm-cache.outputs.dir }}
+#           key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
+#           restore-keys: |
+#             ${{ runner.os }}-node-
+
+#       - name: Cache compiled TS files
+#         id: out-cache
+#         uses: actions/cache@v2
+#         with:
+#           path: ./out
+#           key: ${{runner.os}}-${{env.CACHE_OUT_DIRECTORY}}-${{hashFiles('src/**')}}
+
+#       # For faster/better builds of sdists.
+#       - run: python -m pip install wheel
+#         shell: bash
+
+#       # debugpy is not shipped, only installed for local tests.
+#       # In production, we get debugpy from python extension.
+#       - name: Install functional test requirements
+#         run: |
+#           python -m pip --disable-pip-version-check install -t ./pythonFiles/lib/python --no-cache-dir --implementation py --no-deps --upgrade -r ./requirements.txt
+#           python -m pip --disable-pip-version-check install -r build/debugger-install-requirements.txt
+#           python ./pythonFiles/install_debugpy.py
+#           python -m pip install numpy
+#           python -m pip install --upgrade jupyter
+#           python -m pip install --upgrade -r build/test-requirements.txt
+#           python -m pip install --upgrade -r ./build/ipython-test-requirements.txt
+#           python -m pip install --upgrade -r ./build/conda-functional-requirements.txt
+#           python -m ipykernel install --user
+#         # This step is slow.
+
+#       - name: Install dependencies (npm ci)
+#         run: npm ci --prefer-offline
+#         # This step is slow.
+
+#       - name: Compile if not cached
+#         run: npx gulp prePublishNonBundle
+
+#       - name: Install Julia
+#         uses: julia-actions/setup-julia@v1
+#         with:
+#           version: 1.5.2
+
+#       - name: Install Jualia Kernel
+#         run: |
+#           julia -e '
+#             using Pkg
+#             Pkg.add("IJulia")'
+
+#       - name: Run VSCode tests
+#         uses: GabrielBB/[email protected]
+#         with:
+#           run: npm run testDataScience
+#         env:
+#           DISPLAY: 10
+#           VSCODE_PYTHON_ROLLING: 1
+#           VSC_PYTHON_FORCE_LOGGING: 1
+#           VSC_PYTHON_CI_NON_PYTHON_NB_TEST: 1
+#           VSC_PYTHON_CI_TEST_VSC_CHANNEL: 'insiders'
+#           VSC_PYTHON_LOAD_EXPERIMENTS_FROM_FILE: 'true'
+#         id: test_functional
+
+#       - name: Publish Test Report
+#         uses: scacap/action-surefire-report@v1
+#         with:
+#           github_token: ${{ secrets.GITHUB_TOKEN }}
+#           report_paths: ${{ env.TEST_RESULTS_GLOB }}
+#           check_name: VSCode Test Report
+#         if: steps.test_functional.outcome == 'failure' && failure()
+

package.json

@@ -3344,6 +3344,16 @@
                 "extensions": [
                     ".ipynb"
                 ]
+            },
+            {
+                "id": "julia",
+                "aliases": [
+                    "Julia",
+                    "julia"
+                ],
+                "extensions": [
+                    ".jl"
+                ]
             }
         ],
         "grammars": [

src/client/common/application/notebook.ts

@@ -52,6 +52,11 @@ export class VSCodeNotebook implements IVSCodeNotebook {
             ? this.notebook.onDidCloseNotebookDocument
             : new EventEmitter<NotebookDocument>().event;
     }
+    public get onDidSaveNotebookDocument(): Event<NotebookDocument> {
+        return this.canUseNotebookApi
+            ? this.notebook.onDidSaveNotebookDocument
+            : new EventEmitter<NotebookDocument>().event;
+    }
     public get notebookDocuments(): ReadonlyArray<NotebookDocument> {
         return this.canUseNotebookApi ? this.notebook.notebookDocuments : [];
     }

src/client/common/application/types.ts

@@ -1540,6 +1540,7 @@ export interface IVSCodeNotebook {
     readonly notebookDocuments: ReadonlyArray<NotebookDocument>;
     readonly onDidOpenNotebookDocument: Event<NotebookDocument>;
     readonly onDidCloseNotebookDocument: Event<NotebookDocument>;
+    readonly onDidSaveNotebookDocument: Event<NotebookDocument>;
     readonly onDidChangeActiveNotebookEditor: Event<NotebookEditor | undefined>;
     readonly onDidChangeNotebookDocument: Event<NotebookCellChangedEvent>;
     readonly notebookEditors: Readonly<NotebookEditor[]>;

src/client/datascience/common.ts

@@ -131,11 +131,16 @@ export function traceCellResults(prefix: string, results: ICell[]) {
 }
 
 export function translateKernelLanguageToMonaco(kernelLanguage: string): string {
-    // The only known translation is C# to csharp at the moment
-    if (kernelLanguage === 'C#' || kernelLanguage === 'c#') {
-        return 'csharp';
+    // At the moment these are the only translations.
+    // python, julia, r, javascript, powershell, etc can be left as is.
+    switch (kernelLanguage.toLowerCase()) {
+        case 'c#':
+            return 'csharp';
+        case 'f#':
+            return 'fsharp';
+        default:
+            return kernelLanguage.toLowerCase();
     }
-    return kernelLanguage.toLowerCase();
 }
 
 export function generateNewNotebookUri(