Merge branch 'main' into right-rattlesnake

Author: eleanorjboyd

.eslintrc

@@ -5,7 +5,10 @@
         "mocha": true
     },
     "parser": "@typescript-eslint/parser",
-    "plugins": ["@typescript-eslint"],
+    "plugins": [
+        "@typescript-eslint",
+        "no-only-tests"
+    ],
     "extends": [
         "airbnb",
         "plugin:@typescript-eslint/recommended",
@@ -97,6 +100,7 @@
             }
         ],
         "operator-assignment": "off",
-        "strict": "off"
+        "strict": "off",
+        "no-only-tests/no-only-tests": ["error", { "block": ["test", "suite"], "focus": ["only"] }]
     }
 }

build/azure-pipeline.pre-release.yml

@@ -107,7 +107,7 @@ extends:
             buildType: 'specific'
             project: 'Monaco'
             definition: 591
-            buildVersionToDownload: 'latestFromBranch'
+            buildVersionToDownload: 'latest'
             branchName: 'refs/heads/main'
             targetPath: '$(Build.SourcesDirectory)/python-env-tools/bin'
             artifactName: 'bin-$(vsceTarget)'

package-lock.json

@@ -83,8 +83,7 @@
     "browser": "./dist/extension.browser.js",
     "l10n": "./l10n",
     "contributes": {
-        "problemMatchers":
-        [
+        "problemMatchers": [
             {
                 "name": "python",
                 "owner": "python",
@@ -98,7 +97,6 @@
                     },
                     {
                         "regexp": "^\\s*(.*)\\s*$"
-
                     },
                     {
                         "regexp": "^\\s*(.*Error.*)$",
@@ -682,6 +680,12 @@
                         "experimental"
                     ]
                 },
+                "python.REPL.provideVariables": {
+                    "default": true,
+                    "description": "%python.REPL.provideVariables.description%",
+                    "scope": "resource",
+                    "type": "boolean"
+                },
                 "python.testing.autoTestDiscoverOnSaveEnabled": {
                     "default": true,
                     "description": "%python.testing.autoTestDiscoverOnSaveEnabled.description%",
@@ -1640,6 +1644,7 @@
         "eslint-config-prettier": "^8.3.0",
         "eslint-plugin-import": "^2.29.1",
         "eslint-plugin-jsx-a11y": "^6.3.1",
+        "eslint-plugin-no-only-tests": "^3.3.0",
         "eslint-plugin-react": "^7.20.3",
         "eslint-plugin-react-hooks": "^4.0.0",
         "expose-loader": "^3.1.0",

package.json

@@ -65,6 +65,7 @@
     "python.pixiToolPath.description": "Path to the pixi executable.",
     "python.EnableREPLSmartSend.description": "Toggle Smart Send for the Python REPL. Smart Send enables sending the smallest runnable block of code to the REPL on Shift+Enter and moves the cursor accordingly.",
     "python.REPL.sendToNativeREPL.description": "Toggle to send code to Python REPL instead of the terminal on execution. Turning this on will change the behavior for both Smart Send and Run Selection/Line in the Context Menu.",
+    "python.REPL.provideVariables.description": "Toggle to provide variables for the REPL variable view for the native REPL.",
     "python.tensorBoard.logDirectory.description": "Set this setting to your preferred TensorBoard log directory to skip log directory prompt when starting TensorBoard.",
     "python.tensorBoard.logDirectory.markdownDeprecationMessage": "Tensorboard support has been moved to the extension [Tensorboard extension](https://marketplace.visualstudio.com/items?itemName=ms-toolsai.tensorboard). Instead use the setting `tensorBoard.logDirectory`.",
     "python.tensorBoard.logDirectory.deprecationMessage": "Tensorboard support has been moved to the extension Tensorboard extension. Instead use the setting `tensorBoard.logDirectory`.",

package.nls.json

@@ -71,7 +71,6 @@ def process_data_received(data: str) -> List[Dict[str, Any]]:
 
     This function also:
     - Checks that the jsonrpc value is 2.0
-    - Checks that the last JSON message contains the `eot` token.
     """
     json_messages = []
     remaining = data
@@ -85,18 +84,14 @@ def process_data_received(data: str) -> List[Dict[str, Any]]:
         else:
             json_messages.append(json_data["params"])
 
-    last_json = json_messages.pop(-1)
-    if "eot" not in last_json:
-        raise ValueError("Last JSON messages does not contain 'eot' as its last payload.")
-    return json_messages  # return the list of json messages, only the params part without the EOT token
+    return json_messages  # return the list of json messages
 
 
 def parse_rpc_message(data: str) -> Tuple[Dict[str, str], str]:
     """Process the JSON data which comes from the server.
 
     A single rpc payload is in the format:
     content-length: #LEN# \r\ncontent-type: application/json\r\n\r\n{"jsonrpc": "2.0", "params": ENTIRE_DATA}
-    with EOT params: "params": {"command_type": "discovery", "eot": true}
 
     returns:
     json_data: A single rpc payload of JSON data from the server.

python_files/tests/pytestadapter/helpers.py

@@ -4,6 +4,8 @@
 import pathlib
 import sys
 
+import pytest
+
 script_dir = pathlib.Path(__file__).parent.parent
 sys.path.append(os.fspath(script_dir))
 
@@ -42,3 +44,47 @@ def test_simple_pytest_coverage():
     assert focal_function_coverage.get("lines_missed") is not None
     assert set(focal_function_coverage.get("lines_covered")) == {4, 5, 7, 9, 10, 11, 12, 13, 14, 17}
     assert set(focal_function_coverage.get("lines_missed")) == {18, 19, 6}
+
+
+coverage_file_path = TEST_DATA_PATH / "coverage_gen" / "coverage.json"
+
+
+@pytest.fixture
+def cleanup_coverage_file():
+    # delete the coverage file if it exists as part of test cleanup
+    yield
+    if os.path.exists(coverage_file_path):  # noqa: PTH110
+        os.remove(coverage_file_path)  # noqa: PTH107
+
+
+def test_coverage_gen_report(cleanup_coverage_file):  # noqa: ARG001
+    """
+    Test coverage payload is correct for simple pytest example. Output of coverage run is below.
+
+    Name              Stmts   Miss Branch BrPart  Cover
+    ---------------------------------------------------
+    __init__.py           0      0      0      0   100%
+    reverse.py           13      3      8      2    76%
+    test_reverse.py      11      0      0      0   100%
+    ---------------------------------------------------
+    TOTAL                24      3      8      2    84%
+
+    """
+    args = ["--cov-report=json"]
+    env_add = {"COVERAGE_ENABLED": "True"}
+    cov_folder_path = TEST_DATA_PATH / "coverage_gen"
+    actual = runner_with_cwd_env(args, cov_folder_path, env_add)
+    assert actual
+    coverage = actual[-1]
+    assert coverage
+    results = coverage["result"]
+    assert results
+    assert len(results) == 3
+    focal_function_coverage = results.get(os.fspath(TEST_DATA_PATH / "coverage_gen" / "reverse.py"))
+    assert focal_function_coverage
+    assert focal_function_coverage.get("lines_covered") is not None
+    assert focal_function_coverage.get("lines_missed") is not None
+    assert set(focal_function_coverage.get("lines_covered")) == {4, 5, 7, 9, 10, 11, 12, 13, 14, 17}
+    assert set(focal_function_coverage.get("lines_missed")) == {18, 19, 6}
+    # assert that the coverage file was created at the right path
+    assert os.path.exists(coverage_file_path)  # noqa: PTH110

python_files/tests/pytestadapter/test_coverage.py

@@ -16,7 +16,6 @@
 # If I use from utils then there will be an import error in test_discovery.py.
 from unittestadapter.pvsc_utils import (  # noqa: E402
     DiscoveryPayloadDict,
-    EOTPayloadDict,
     VSCodeUnittestError,
     build_test_tree,
     parse_unittest_args,
@@ -129,7 +128,6 @@ def discover_tests(
             # collect args for Django discovery runner.
             args = argv[index + 1 :] or []
             django_discovery_runner(manage_py_path, args)
-            # eot payload sent within Django runner.
         except Exception as e:
             error_msg = f"Error configuring Django test runner: {e}"
             print(error_msg, file=sys.stderr)
@@ -139,6 +137,3 @@ def discover_tests(
         payload = discover_tests(start_dir, pattern, top_level_dir)
         # Post this discovery payload.
         send_post_request(payload, test_run_pipe)
-        # Post EOT token.
-        eot_payload: EOTPayloadDict = {"command_type": "discovery", "eot": True}
-        send_post_request(eot_payload, test_run_pipe)

python_files/unittestadapter/discovery.py

@@ -13,7 +13,6 @@
 from execution import UnittestTestResult  # noqa: E402
 from pvsc_utils import (  # noqa: E402
     DiscoveryPayloadDict,
-    EOTPayloadDict,
     VSCodeUnittestError,
     build_test_tree,
     send_post_request,
@@ -64,9 +63,6 @@ def run_tests(self, test_labels, **kwargs):
 
             # Send discovery payload.
             send_post_request(payload, test_run_pipe)
-            # Send EOT token.
-            eot_payload: EOTPayloadDict = {"command_type": "discovery", "eot": True}
-            send_post_request(eot_payload, test_run_pipe)
             return 0  # Skip actual test execution, return 0 as no tests were run.
         except Exception as e:
             error_msg = (

python_files/unittestadapter/django_test_runner.py

@@ -25,7 +25,6 @@
 
 from unittestadapter.pvsc_utils import (  # noqa: E402
     CoveragePayloadDict,
-    EOTPayloadDict,
     ExecutionPayloadDict,
     FileCoverageInfo,
     TestExecutionStatus,
@@ -60,21 +59,6 @@ def startTest(self, test: unittest.TestCase):  # noqa: N802
 
     def stopTestRun(self):  # noqa: N802
         super().stopTestRun()
-        # After stopping the test run, send EOT
-        test_run_pipe = os.getenv("TEST_RUN_PIPE")
-        if os.getenv("MANAGE_PY_PATH"):
-            # only send this if it is a Django run
-            if not test_run_pipe:
-                print(
-                    "UNITTEST ERROR: TEST_RUN_PIPE is not set at the time of unittest trying to send data. "
-                    f"TEST_RUN_PIPE = {test_run_pipe}\n",
-                    file=sys.stderr,
-                )
-                raise VSCodeUnittestError(
-                    "UNITTEST ERROR: TEST_RUN_PIPE is not set at the time of unittest trying to send data. "
-                )
-            eot_payload: EOTPayloadDict = {"command_type": "execution", "eot": True}
-            send_post_request(eot_payload, test_run_pipe)
 
     def addError(  # noqa: N802
         self,
@@ -269,15 +253,8 @@ def run_tests(
     return payload
 
 
-def execute_eot_and_cleanup():
-    eot_payload: EOTPayloadDict = {"command_type": "execution", "eot": True}
-    send_post_request(eot_payload, test_run_pipe)
-    if __socket:
-        __socket.close()
-
-
 __socket = None
-atexit.register(execute_eot_and_cleanup)
+atexit.register(lambda: __socket.close() if __socket else None)
 
 
 def send_run_data(raw_data, test_run_pipe):
@@ -361,7 +338,6 @@ def send_run_data(raw_data, test_run_pipe):
         print("MANAGE_PY_PATH env var set, running Django test suite.")
         args = argv[index + 1 :] or []
         django_execution_runner(manage_py_path, test_ids, args)
-        # the django run subprocesses sends the eot payload.
     else:
         # Perform regular unittest execution.
         payload = run_tests(