Skip to content

Commit 6752286

Browse files
dmitrivMSCopilot
dmitrivMS
and
Copilot
committed
Merge branch 'main' into agents/fix-bracket-notation-app-environment
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
2 parents 92dd4d1 + 17c5935 commit 6752286

134 files changed

Lines changed: 7163 additions & 961 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/codeql/codeql-config.yml‎

Lines changed: 105 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,115 @@
1-
# Apply this file to CodeQL default setup with the repository property:
2-
# github-codeql-config-file: ./.github/codeql/codeql-config.yml
1+
# Applied by .github/workflows/codeql.yml.
32
paths-ignore:
4-
# Keep directory exclusions scoped: product code imports helpers from some
5-
# extension src/test directories.
6-
- 'test/**'
7-
- 'src/**/test/**'
8-
- 'build/**/test/**'
3+
# Development, build, packaging, and CI tooling, not shipped product code.
4+
- '.agents/**'
5+
- '.eslint-plugin-local/**'
6+
- '.github/**'
7+
- '.vscode-test.js'
8+
- '.vscode/**'
9+
- 'build/**'
10+
- 'cli/build.rs'
11+
- 'eslint.config.js'
12+
- 'extensions/**/.esbuild.*'
13+
- 'extensions/*/build/**'
14+
- 'extensions/*/esbuild*.mts'
15+
- 'extensions/*/scripts/**'
16+
- 'extensions/copilot/.eslintplugin/**'
17+
- 'extensions/copilot/.mocha-multi-reporters.js'
18+
- 'extensions/copilot/.mocharc.js'
19+
- 'extensions/copilot/.vscode-test.mjs'
20+
- 'extensions/copilot/.vscode/**'
21+
- 'extensions/copilot/chat-lib/vitest.config.ts'
22+
- 'extensions/copilot/script/**'
23+
- 'extensions/copilot/vite.config.ts'
24+
- 'extensions/esbuild*.mts'
25+
- 'extensions/postinstall.mjs'
26+
- 'extensions/search-result/syntaxes/generateTMLanguage.js'
27+
- 'gulpfile.mjs'
28+
- 'scripts/**'
29+
30+
# Generated build output and dependencies; analyze the product sources instead.
31+
- '**/node_modules/**'
32+
- '**/out/**'
33+
- '.build/**'
34+
- 'cli/target/**'
35+
- 'coverage/**'
36+
- 'extensions/**/dist/**'
37+
- 'out*/**'
38+
39+
# Test directories, fixtures, and helpers.
940
- 'cli/tests/**'
10-
- '.eslint-plugin-local/tests/**'
41+
- 'extensions/*/server/**/test/**'
42+
- 'extensions/*/test-workspace/**'
1143
- 'extensions/*/test/**'
1244
- 'extensions/*/tests/**'
45+
- 'extensions/configuration-editing/src/test/**'
46+
- 'extensions/copilot/src/extension/**/test/**'
47+
- 'extensions/copilot/src/extension/agents/node/adapters/openaiAdapterForSTests.ts'
48+
- 'extensions/copilot/src/extension/typescriptContext/serverPlugin/fixtures/**'
49+
- 'extensions/copilot/src/lib/**/test/**'
50+
- 'extensions/copilot/src/platform/**/test/**'
51+
- 'extensions/copilot/src/platform/commands/common/mockRunCommandExecutionService.ts'
52+
- 'extensions/copilot/src/platform/notebook/common/mockAlternativeContentService.ts'
53+
- 'extensions/copilot/src/platform/tasks/common/testTasksService.ts'
54+
- 'extensions/copilot/src/sanity-test-extension.ts'
55+
- 'extensions/copilot/src/shared-fetch-utils/**/test/**'
56+
- 'extensions/copilot/src/test-extension.ts'
57+
# Standalone chat-lib rewrites runtime VS Code API imports to util/common/test/shims.
58+
# These are required runtime dependencies, not tests; exclude only their test-only siblings.
59+
- 'extensions/copilot/src/util/common/test/annotatedSrc.ts'
60+
- 'extensions/copilot/src/util/common/test/mockChatResponseStream.ts'
61+
- 'extensions/copilot/src/util/common/test/simpleMock.ts'
62+
- 'extensions/copilot/src/util/common/test/testUtils.ts'
63+
- 'extensions/copilot/src/util/node/test/**'
64+
- 'extensions/copilot/src/util/test/**'
65+
- 'extensions/emmet/src/test/**'
66+
- 'extensions/git-base/src/test/**'
67+
- 'extensions/git/src/test/**'
68+
- 'extensions/github-authentication/src/test/**'
69+
- 'extensions/github/src/test/**'
70+
- 'extensions/ipynb/src/test/**'
71+
- 'extensions/markdown-language-features/src/test/**'
72+
- 'extensions/microsoft-authentication/src/**/test/**'
73+
- 'extensions/notebook-renderers/src/test/**'
74+
- 'extensions/npm/src/test/**'
75+
- 'extensions/terminal-suggest/fixtures/**'
76+
- 'extensions/terminal-suggest/src/**/test/**'
77+
- 'extensions/typescript-language-features/src/test-all.ts'
78+
- 'extensions/typescript-language-features/src/test/**'
79+
- 'extensions/vscode-api-tests/**'
80+
- 'extensions/vscode-colorize-perf-tests/**'
81+
- 'extensions/vscode-colorize-tests/**'
82+
- 'extensions/vscode-test-resolver/**'
83+
- 'src/**/test/**'
84+
- 'src/vs/workbench/contrib/terminal/browser/terminalTestHelpers.ts'
85+
- 'test/**'
86+
1387
# Keep exact suffixes: themes.test.contribution.ts ships in the product.
88+
- '**/*.fixture.cjs'
89+
- '**/*.fixture.cts'
90+
- '**/*.fixture.js'
91+
- '**/*.fixture.jsx'
92+
- '**/*.fixture.mjs'
93+
- '**/*.fixture.mts'
94+
- '**/*.fixture.ts'
95+
- '**/*.fixture.tsx'
96+
- '**/*.sanity-test.ts'
97+
- '**/*.sanity-test.tsx'
98+
- '**/*.spec.cjs'
99+
- '**/*.spec.cts'
100+
- '**/*.spec.js'
101+
- '**/*.spec.jsx'
102+
- '**/*.spec.mjs'
103+
- '**/*.spec.mts'
104+
- '**/*.spec.ts'
105+
- '**/*.spec.tsx'
106+
- '**/*.stest.ts'
107+
- '**/*.stest.tsx'
108+
- '**/*.test.cjs'
109+
- '**/*.test.cts'
14110
- '**/*.test.js'
15111
- '**/*.test.jsx'
16112
- '**/*.test.mjs'
17-
- '**/*.test.cjs'
113+
- '**/*.test.mts'
18114
- '**/*.test.ts'
19115
- '**/*.test.tsx'
20-
- '**/*.test.mts'
21-
- '**/*.test.cts'

‎.github/workflows/codeql.yml‎

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
name: CodeQL
2+
3+
on:
4+
push:
5+
branches:
6+
- main
7+
- 'release/**/*'
8+
pull_request:
9+
branches:
10+
- main
11+
- 'release/**/*'
12+
schedule:
13+
- cron: '17 19 * * 6'
14+
15+
permissions: {}
16+
17+
jobs:
18+
analyze:
19+
name: Analyze (${{ matrix.language }})
20+
runs-on: ubuntu-latest
21+
permissions:
22+
actions: read
23+
contents: read
24+
packages: read
25+
security-events: write
26+
strategy:
27+
fail-fast: false
28+
matrix:
29+
# Other detected languages occur only in test fixtures or build tooling.
30+
include:
31+
- language: javascript-typescript
32+
build-mode: none
33+
- language: rust
34+
build-mode: none
35+
36+
steps:
37+
- name: Checkout repository
38+
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
39+
40+
- name: Initialize CodeQL
41+
uses: github/codeql-action/init@cdf488f595d80d6e07e03d4674febd5ab45fa938 # v4.37.9
42+
with:
43+
languages: ${{ matrix.language }}
44+
build-mode: ${{ matrix.build-mode }}
45+
dependency-caching: true
46+
config-file: ./.github/codeql/codeql-config.yml
47+
48+
- name: Perform CodeQL Analysis
49+
uses: github/codeql-action/analyze@cdf488f595d80d6e07e03d4674febd5ab45fa938 # v4.37.9
50+
with:
51+
category: /language:${{ matrix.language }}

‎CodeQL.yml‎

Lines changed: 0 additions & 30 deletions
This file was deleted.

‎build/azure-pipelines/dependencies-check.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ parameters:
77
type: string
88

99
variables:
10+
- name: Codeql.SkipTaskAutoInjection
11+
value: true
1012
- name: NPM_REGISTRY
1113
value: "https://pkgs.dev.azure.com/monacotools/Monaco/_packaging/vscode/npm/registry/"
1214
- name: VSCODE_QUALITY

‎build/azure-pipelines/publish-types/publish-types.yml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,10 @@ trigger:
66

77
pr: none
88

9+
variables:
10+
- name: Codeql.SkipTaskAutoInjection
11+
value: true
12+
913
pool:
1014
vmImage: ubuntu-latest
1115

‎build/next/index.ts‎

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -662,12 +662,17 @@ function fileContentMapperPlugin(outDir: string, target: BuildTarget): esbuild.P
662662
// Inject built-in extensions list
663663
if (contents.includes('/*BUILD->INSERT_BUILTIN_EXTENSIONS*/')) {
664664
if (builtinExtensionsReplacement === undefined) {
665-
// Web target uses .build/web/extensions (from compileWebExtensionsBuildTask)
666-
// Other targets use .build/extensions
667-
const extensionsRoot = target === 'web' ? '.build/web/extensions' : '.build/extensions';
668-
const builtinExtensions = JSON.stringify(scanBuiltinExtensions(extensionsRoot));
669-
// Remove the outer brackets since the placeholder is inside an array literal
670-
builtinExtensionsReplacement = builtinExtensions.substring(1, builtinExtensions.length - 1);
665+
if (target === 'web' || target === 'server-web') {
666+
// Web target uses .build/web/extensions (from compileWebExtensionsBuildTask)
667+
// while server-web uses .build/extensions.
668+
const extensionsRoot = target === 'web' ? '.build/web/extensions' : '.build/extensions';
669+
const builtinExtensions = JSON.stringify(scanBuiltinExtensions(extensionsRoot));
670+
// Remove the outer brackets since the placeholder is inside an array literal
671+
builtinExtensionsReplacement = builtinExtensions.substring(1, builtinExtensions.length - 1);
672+
} else {
673+
// Native targets never consume the web-only bundled extension list.
674+
builtinExtensionsReplacement = '';
675+
}
671676
}
672677
contents = contents.replace('/*BUILD->INSERT_BUILTIN_EXTENSIONS*/', () => builtinExtensionsReplacement!);
673678
modified = true;

‎extensions/copilot/CodeQL.yml‎

Lines changed: 0 additions & 5 deletions
This file was deleted.

‎extensions/copilot/build/update-assets.yml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
trigger: none
22
pr: none
33

4+
variables:
5+
- name: Codeql.SkipTaskAutoInjection
6+
value: true
7+
48
resources:
59
repositories:
610
- repository: 1esPipelines

‎extensions/copilot/src/extension/completions-core/vscode-node/lib/src/ghostText/test/streamedCompletionSplitter.test.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@ class FakeCompletionsFetchService implements ICompletionsFetchService {
5555
serverExperiments: '',
5656
deploymentId: '',
5757
gitHubRequestId: '',
58+
copilotServiceRequestId: '',
5859
completionId: '',
5960
created: 0
6061
}, headers);

‎extensions/copilot/src/extension/completions-core/vscode-node/lib/src/openai/fetch.fake.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ export function fakeAPIChoice(
4646
serverExperiments: 'dummy',
4747
deploymentId: 'dummy',
4848
gitHubRequestId: 'dummy',
49+
copilotServiceRequestId: 'dummy',
4950
completionId: 'dummy',
5051
created: 0
5152
},

0 commit comments

Comments
 (0)