From 92f21bfb5beb4af84f0196f3c5224e0d57b61c33 Mon Sep 17 00:00:00 2001 From: Jeremy Rifkin <51220084+jeremy-rifkin@users.noreply.github.com> Date: Wed, 20 Mar 2024 16:09:44 -0500 Subject: [PATCH 1/4] Fix bug with highlighting of C++ raw string literals (#4436) * Fix bug with highlighting of C++ raw string literals * Update to today's monaco-editor-core * Continue generating `string.raw.end` tokens --------- Co-authored-by: Alex Dima --- package-lock.json | 14 +++++++------- package.json | 2 +- src/basic-languages/cpp/cpp.ts | 18 +++--------------- 3 files changed, 11 insertions(+), 23 deletions(-) diff --git a/package-lock.json b/package-lock.json index 898c52d5..d16217f1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -25,7 +25,7 @@ "jsdom": "^19.0.0", "jsonc-parser": "^3.0.0", "mocha": "^9.2.0", - "monaco-editor-core": "0.48.0-dev-20240319", + "monaco-editor-core": "0.48.0-dev-20240320", "parcel": "^2.7.0", "pin-github-action": "^1.8.0", "playwright": "^1.32.2", @@ -5388,9 +5388,9 @@ "dev": true }, "node_modules/monaco-editor-core": { - "version": "0.48.0-dev-20240319", - "resolved": "https://registry.npmjs.org/monaco-editor-core/-/monaco-editor-core-0.48.0-dev-20240319.tgz", - "integrity": "sha512-w8QasiJcJY/XPHPqtqj1+aokHrFIFBYuKOOABFT9vDmTEp/0euMxARhwc0R1VvtQ1hSFVKb0CQq6X1kMdgvbbQ==", + "version": "0.48.0-dev-20240320", + "resolved": "https://registry.npmjs.org/monaco-editor-core/-/monaco-editor-core-0.48.0-dev-20240320.tgz", + "integrity": "sha512-fXS0Bt39Qv9C10Cuuf0ZvgcK8LhN+fP+27sDfjILEQCUVRa4pDAtvZOny2BiiPqsmOINch8UVNSZtH7+Af3ngQ==", "dev": true }, "node_modules/mri": { @@ -11144,9 +11144,9 @@ } }, "monaco-editor-core": { - "version": "0.48.0-dev-20240319", - "resolved": "https://registry.npmjs.org/monaco-editor-core/-/monaco-editor-core-0.48.0-dev-20240319.tgz", - "integrity": "sha512-w8QasiJcJY/XPHPqtqj1+aokHrFIFBYuKOOABFT9vDmTEp/0euMxARhwc0R1VvtQ1hSFVKb0CQq6X1kMdgvbbQ==", + "version": "0.48.0-dev-20240320", + "resolved": "https://registry.npmjs.org/monaco-editor-core/-/monaco-editor-core-0.48.0-dev-20240320.tgz", + "integrity": "sha512-fXS0Bt39Qv9C10Cuuf0ZvgcK8LhN+fP+27sDfjILEQCUVRa4pDAtvZOny2BiiPqsmOINch8UVNSZtH7+Af3ngQ==", "dev": true }, "mri": { diff --git a/package.json b/package.json index 70431bb6..3bee1ae5 100644 --- a/package.json +++ b/package.json @@ -52,7 +52,7 @@ "jsdom": "^19.0.0", "jsonc-parser": "^3.0.0", "mocha": "^9.2.0", - "monaco-editor-core": "0.48.0-dev-20240319", + "monaco-editor-core": "0.48.0-dev-20240320", "parcel": "^2.7.0", "pin-github-action": "^1.8.0", "playwright": "^1.32.2", diff --git a/src/basic-languages/cpp/cpp.ts b/src/basic-languages/cpp/cpp.ts index 6c721af5..1dbffd45 100644 --- a/src/basic-languages/cpp/cpp.ts +++ b/src/basic-languages/cpp/cpp.ts @@ -378,21 +378,9 @@ export const language = { ], raw: [ - [ - /(.*)(\))(?:([^ ()\\\t"]*))(\")/, - { - cases: { - '$3==$S2': [ - 'string.raw', - 'string.raw.end', - 'string.raw.end', - { token: 'string.raw.end', next: '@pop' } - ], - '@default': ['string.raw', 'string.raw', 'string.raw', 'string.raw'] - } - } - ], - [/.*/, 'string.raw'] + [/[^)]+/, 'string.raw'], + [/\)$S2\"/, { token: 'string.raw.end', next: '@pop' }], + [/\)/, 'string.raw'] ], annotation: [ From 9f5ddf9d19f9910507e0a5d70806ec5599688d8a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 23 Mar 2024 08:25:05 +0000 Subject: [PATCH 2/4] Bump webpack-dev-middleware from 5.3.3 to 5.3.4 in /samples Bumps [webpack-dev-middleware](https://github.com/webpack/webpack-dev-middleware) from 5.3.3 to 5.3.4. - [Release notes](https://github.com/webpack/webpack-dev-middleware/releases) - [Changelog](https://github.com/webpack/webpack-dev-middleware/blob/v5.3.4/CHANGELOG.md) - [Commits](https://github.com/webpack/webpack-dev-middleware/compare/v5.3.3...v5.3.4) --- updated-dependencies: - dependency-name: webpack-dev-middleware dependency-type: indirect ... Signed-off-by: dependabot[bot] --- samples/package-lock.json | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/samples/package-lock.json b/samples/package-lock.json index cd06fd8d..3ed6ac53 100644 --- a/samples/package-lock.json +++ b/samples/package-lock.json @@ -4322,9 +4322,10 @@ } }, "node_modules/webpack-dev-middleware": { - "version": "5.3.3", + "version": "5.3.4", + "resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-5.3.4.tgz", + "integrity": "sha512-BVdTqhhs+0IfoeAf7EoH5WE+exCmqGerHfDM0IL096Px60Tq2Mn9MAbnaGUe6HiMa41KMCYF19gyzZmBcq/o4Q==", "dev": true, - "license": "MIT", "dependencies": { "colorette": "^2.0.10", "memfs": "^3.4.3", @@ -7315,7 +7316,9 @@ } }, "webpack-dev-middleware": { - "version": "5.3.3", + "version": "5.3.4", + "resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-5.3.4.tgz", + "integrity": "sha512-BVdTqhhs+0IfoeAf7EoH5WE+exCmqGerHfDM0IL096Px60Tq2Mn9MAbnaGUe6HiMa41KMCYF19gyzZmBcq/o4Q==", "dev": true, "requires": { "colorette": "^2.0.10", From 7014d409360cd82446c3ad157c609dc9e19784e0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 23 Mar 2024 13:19:33 +0000 Subject: [PATCH 3/4] Bump webpack-dev-middleware from 5.3.3 to 5.3.4 in /website Bumps [webpack-dev-middleware](https://github.com/webpack/webpack-dev-middleware) from 5.3.3 to 5.3.4. - [Release notes](https://github.com/webpack/webpack-dev-middleware/releases) - [Changelog](https://github.com/webpack/webpack-dev-middleware/blob/v5.3.4/CHANGELOG.md) - [Commits](https://github.com/webpack/webpack-dev-middleware/compare/v5.3.3...v5.3.4) --- updated-dependencies: - dependency-name: webpack-dev-middleware dependency-type: indirect ... Signed-off-by: dependabot[bot] --- website/yarn.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/website/yarn.lock b/website/yarn.lock index 25440c41..07b09ad2 100644 --- a/website/yarn.lock +++ b/website/yarn.lock @@ -3374,9 +3374,9 @@ webpack-cli@^4.10.0: webpack-merge "^5.7.3" webpack-dev-middleware@^5.3.1: - version "5.3.3" - resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-5.3.3.tgz#efae67c2793908e7311f1d9b06f2a08dcc97e51f" - integrity sha512-hj5CYrY0bZLB+eTO+x/j67Pkrquiy7kWepMHmUMoPsmcUaeEnQJqFzHJOyxgWlq746/wUuA64p9ta34Kyb01pA== + version "5.3.4" + resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-5.3.4.tgz#eb7b39281cbce10e104eb2b8bf2b63fce49a3517" + integrity sha512-BVdTqhhs+0IfoeAf7EoH5WE+exCmqGerHfDM0IL096Px60Tq2Mn9MAbnaGUe6HiMa41KMCYF19gyzZmBcq/o4Q== dependencies: colorette "^2.0.10" memfs "^3.4.3" From 8503aef01e4f06dff414c15904a1d961e25eb8eb Mon Sep 17 00:00:00 2001 From: Raymond Zhao <7199958+rzhao271@users.noreply.github.com> Date: Fri, 29 Mar 2024 11:59:20 -0700 Subject: [PATCH 4/4] chore: CG ignore VS Code extensions for nightly (#4451) --- .azure-pipelines/publish-nightly.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.azure-pipelines/publish-nightly.yml b/.azure-pipelines/publish-nightly.yml index 9611b7cc..67547036 100644 --- a/.azure-pipelines/publish-nightly.yml +++ b/.azure-pipelines/publish-nightly.yml @@ -44,6 +44,7 @@ parameters: extends: template: azure-pipelines/npm-package/pipeline.yml@templates parameters: + cgIgnoreDirectories: $(Build.SourcesDirectory)/dependencies/vscode/extensions npmPackages: - name: monaco-editor-core workingDirectory: $(Build.SourcesDirectory)/dependencies/vscode/out-monaco-editor-core