Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix an automatic rebase against the upstream #121

Merged
merged 121 commits into from
Sep 29, 2022
Merged
Changes from all commits
Commits
Show all changes
121 commits
Select commit Hold shift + click to select a range
797fb52
Test
matthewjamesadam Aug 24, 2022
78851b5
Cleanup
matthewjamesadam Aug 25, 2022
8533550
Remove
matthewjamesadam Aug 29, 2022
00414a3
Update Groovy extension language contribution
thernstig Sep 8, 2022
1643a42
Merge branch 'main' into matthewjamesadam/LeftAlignTooltipToBeforeCon…
alexdima Sep 21, 2022
d0c5e38
fix turn on sync
sandy081 Sep 25, 2022
816cd66
Include applicationName in zsh shell integration folder name
Tyriar Sep 26, 2022
8cd272d
Merge branch 'main' into tyriar/159182
Tyriar Sep 26, 2022
0b1c344
Push action required extensions to the top and allow to ignore update…
benibenj Sep 26, 2022
b8a7485
Fix markdown preview refresh from disk (#161800)
mjbvz Sep 26, 2022
60a3df4
Merge pull request #161705 from microsoft/sandy081/arrogant-starfish
sandy081 Sep 26, 2022
b42e424
tweak name to reset all menu hiding (#161801)
jrieken Sep 26, 2022
811fbff
show the profiles menu like other menus (#161803)
sandy081 Sep 26, 2022
9c618ec
Merge pull request #161783 from microsoft/tyriar/159182
Tyriar Sep 26, 2022
2b0d08b
show the current short name in the input (#161812)
sandy081 Sep 26, 2022
cfe0125
skip test on windows (#161794)
meganrogge Sep 26, 2022
d23eed7
enable syncing profiles (#161814)
sandy081 Sep 26, 2022
29e985e
rev vscode-nls to version that doesn't ask for vscode-nls-web-data (#…
TylerLeonhardt Sep 26, 2022
ed48c7b
add create temp profile action to create picker (#161810)
sandy081 Sep 26, 2022
ff9e92c
fix: propagate log level to client
jsjoeio Sep 23, 2022
e2207cb
fix search unit tests using FileMatch createInstance (#161817)
andreamah Sep 26, 2022
1a76ad9
Allow free port to run on any command (single char+)
Tyriar Sep 26, 2022
ed1f954
update initialText in reused terminal before showing it (#161818)
meganrogge Sep 26, 2022
6bbdabb
contextual action -> quick fix (#161638)
meganrogge Sep 26, 2022
9ccd1be
don't try shell integration for winpty (#161821)
meganrogge Sep 26, 2022
04bb72a
Merge remote-tracking branch 'origin/main' into tyriar/any_command
Tyriar Sep 26, 2022
045bed8
Fixes #161725 (#161826)
TylerLeonhardt Sep 26, 2022
bcbf0d8
Fix NotebookEditorModel#isResolved. Fix #161049. (#161829)
rebornix Sep 26, 2022
34d8743
Improves merge editor code-lens (#161830)
hediet Sep 26, 2022
5183e9b
Make some more services lazy (#161827)
lramos15 Sep 26, 2022
c3b5a74
Merge pull request #161642 from jsjoeio/jsjoeio/fix-log-level
sandy081 Sep 26, 2022
9b4be06
dispose of decoration on run action, not after click (#161813)
meganrogge Sep 26, 2022
0110cae
Merge pull request #161825 from microsoft/tyriar/any_command
Tyriar Sep 26, 2022
313203e
Merge remote-tracking branch 'origin/main' into pr/matthewjamesadam/1…
alexdima Sep 26, 2022
741fa37
[json/css/html] update services / deps (#161831)
aeschli Sep 26, 2022
8013a36
Fix nb diff overview ruler scaling. (#161832)
rebornix Sep 26, 2022
3c9903f
Merge pull request #161836 from microsoft/alexd/pr-159226
alexdima Sep 26, 2022
6e08412
Merge editor improvements (#161837)
hediet Sep 26, 2022
a07a479
Ensure quotes are stripped from cwd
Tyriar Sep 26, 2022
0df97dd
Not add '[' to ipv6 host when '[' exists. (#157009)
Sep 26, 2022
a073977
Don't keep hover visible if it isn't sticky (#161839)
alexdima Sep 26, 2022
ad23961
rearrange import and export actions (#161843)
sandy081 Sep 26, 2022
395b017
fix styling (#161844)
sandy081 Sep 26, 2022
9e0e4a2
Merge pull request #161841 from microsoft/tyriar/160109
Tyriar Sep 26, 2022
06bd7ae
[css] use findDocumentSymbols (#161847)
aeschli Sep 26, 2022
9883eb4
Need to spread the array for format (#161852)
TylerLeonhardt Sep 26, 2022
4f26134
Search Tree Compression (#161546)
andreamah Sep 26, 2022
121f130
Bind `isMobile` context key (#161854)
joyceerhl Sep 26, 2022
be778b7
Update inlay hints contrast (#161859)
daviddossett Sep 26, 2022
7ac6686
`Show Edit Session` should always be available in palette (#161866)
joyceerhl Sep 26, 2022
191bd09
Delay custom editor service (#161871)
mjbvz Sep 27, 2022
36b1398
Search tree in multiroot doesn't collapse to one below root (#161863)
andreamah Sep 27, 2022
26ef29d
Unit test failure: TextFileEditorModel save() and isDirty() (fix #161…
bpasero Sep 27, 2022
b4d9700
debug: bump js-debug (#161898)
connor4312 Sep 27, 2022
42a198b
Merge pull request #160385 from thernstig/patch-1
hediet Sep 27, 2022
29b8a1e
Run OSS tool (#161956)
alexdima Sep 27, 2022
809ccec
update distro (#161957)
alexdima Sep 27, 2022
dbfdbb2
Fix #161904 (#161927)
benibenj Sep 27, 2022
8b8767e
Badge value is not type validated (#161966)
alexr00 Sep 27, 2022
43894c6
add Cargo.toml for inno-updater (#161976)
joaomoreno Sep 27, 2022
70a7ce4
Auto releasing a build needs peer approval (#161981)
joaomoreno Sep 27, 2022
fa91f63
Prevent exception in attachToElement
Tyriar Sep 27, 2022
ea5b244
File snippets for HTML and PHP (#161881)
digitarald Sep 27, 2022
6274321
show builtin extensions if the require an action (#161986)
benibenj Sep 27, 2022
97fd38a
Update inserted/removed diff character background (#161275)
daviddossett Sep 27, 2022
c812153
badge should not allow decimal values (#162001)
alexr00 Sep 27, 2022
a29fd5e
show correct path for install dir warning (#161996)
bpasero Sep 27, 2022
0279e21
Change "load all" to "load more" (#162015)
roblourens Sep 27, 2022
83f71ab
fix #161933 (#162029)
sandy081 Sep 27, 2022
83bbb39
Fix settings sync typo (#162050)
roblourens Sep 27, 2022
4e074b4
Update xterm
Tyriar Sep 27, 2022
6cf761e
Merge pull request #162058 from microsoft/tyriar/xterm_update3
Tyriar Sep 27, 2022
b712a79
tweak regex for create PR (#162055)
meganrogge Sep 27, 2022
8b4a451
tweak regex for git similar command (#162057)
meganrogge Sep 27, 2022
b4600da
Fix audio mime type listing (#162063)
mjbvz Sep 27, 2022
ca635a3
Add playsInline to video (#162065)
mjbvz Sep 27, 2022
4f0edb3
Pick up latest TS 4.8.4 recovery (#162059)
mjbvz Sep 27, 2022
0857860
focus on first item in quick fix menu (#162064)
meganrogge Sep 27, 2022
8f43917
Fix #161917. Bind pointer event listener on overview container (#162061)
rebornix Sep 27, 2022
2d6d6cd
Fix free port quick fix on Windows
Tyriar Sep 27, 2022
58f254a
Improve free port messages
Tyriar Sep 27, 2022
0994dab
Fix selection of notebook renderers for outputs (#162068)
mjbvz Sep 27, 2022
c66e0fa
Add terminal quick fix to commands to skip shell
Tyriar Sep 27, 2022
2c68fb3
Merge pull request #162079 from microsoft/tyriar/162078
Tyriar Sep 27, 2022
c0f5b32
Merge pull request #162075 from microsoft/tyriar/wording
Tyriar Sep 27, 2022
970bc5d
Merge remote-tracking branch 'origin/main' into tyriar/161775
Tyriar Sep 27, 2022
e77c6d8
Fix extracting correct PID on Windows
Tyriar Sep 27, 2022
5c35efe
Merge pull request #161989 from microsoft/tyriar/160914_2
Tyriar Sep 27, 2022
63abb75
Merge pull request #162072 from microsoft/tyriar/161775
Tyriar Sep 27, 2022
7d99677
fix quick fix css (#162084)
meganrogge Sep 28, 2022
fd06e2f
Various terminal quick fix fixes (#162083)
Tyriar Sep 28, 2022
3b395e2
Fix https://github.com/microsoft/vscode/issues/161935
joyceerhl Sep 28, 2022
e1730b2
Fix https://github.com/microsoft/vscode/issues/162034
joyceerhl Sep 28, 2022
689cfc7
Don't prompt for auth if the auth session that the user previously us…
joyceerhl Sep 28, 2022
c2a2ad4
Rename image-preview extension to media-preview (#162093)
mjbvz Sep 28, 2022
7b7f5a0
Fix output sizing for multiline evaluation result (#162101)
roblourens Sep 28, 2022
835d39c
Merge pull request #162106 from microsoft/dev/joyceerhl/written-condor
joyceerhl Sep 28, 2022
7ff04ba
Revert "Engineering - use specific image version (#160878)" (#162052)
lszomoru Sep 28, 2022
0445715
fix #161961 (#162136)
sandy081 Sep 28, 2022
3527824
Fix #162134 (#162140)
sandy081 Sep 28, 2022
8044546
Add `$schema` to `cgmanifest.json` (#159779)
JamieMagee Sep 28, 2022
7559012
Git protocol handler improvements (#162144)
lszomoru Sep 28, 2022
f8a2968
Changing the z-index of the find options widget so it appears above t…
Sep 28, 2022
0e23403
Fixes #162111
hediet Sep 28, 2022
b3434bf
Fix #161868 (#162148)
sandy081 Sep 28, 2022
bc07a5d
Fix #161862 (#162156)
sandy081 Sep 28, 2022
d3f8375
fix #161791 (#162158)
sandy081 Sep 28, 2022
3393acc
Merge pull request #162146 from microsoft/aiday/issue160627
Sep 28, 2022
b0f88c1
Fixes #162005 (#162161)
hediet Sep 28, 2022
a1e8a52
Fixes conflict block rendering bug. (#162162)
hediet Sep 28, 2022
8efbe80
Making the stash visible by changing the CSS parameters
Sep 28, 2022
55a5e84
Fixes #161967 (#162165)
hediet Sep 28, 2022
e59d1e2
Merge pull request #162167 from microsoft/aiday/issue160271
Sep 28, 2022
df0a857
Install all outdated extensions action (#162170)
benibenj Sep 28, 2022
dfca1cc
Merge pull request #162150 from microsoft/hediet/additional-shark
hediet Sep 28, 2022
2428297
fix #161618 (#162171)
jrieken Sep 28, 2022
582aa29
stop shipping build-only dependencies (#162172)
joaomoreno Sep 28, 2022
d31d71d
check basename, not separator and name (#162174)
jrieken Sep 28, 2022
66f8b2c
Fix the replace commands when rebasing
azatsarynnyy Sep 28, 2022
2b35831
Update the replacing rules when rebasing
azatsarynnyy Sep 28, 2022
9c65e2a
Rebase against the upstream d31d71d8cc480313088a384ebb2c9e4f682601ae
azatsarynnyy Sep 28, 2022
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[

{
"from": "${webSocketSchema}://${/:/.test(host) ? `[${host}]` : host}:${port}${path}/?${query}",
"from": "${webSocketSchema}://${(/:/.test(host) && !/\\\\[/.test(host)) ? `[${host}]` : host}:${port}${path}?${query}",
"by": "${webSocketSchema}://${window.location.host}${window.location.pathname}?${query}"
}
]
142 changes: 0 additions & 142 deletions code/.vscode/cgmanifest.schema.json

This file was deleted.

3 changes: 2 additions & 1 deletion code/.vscode/settings.json
Original file line number Diff line number Diff line change
@@ -53,7 +53,7 @@
"fileMatch": [
"cgmanifest.json"
],
"url": "./.vscode/cgmanifest.schema.json"
"url": "https://json.schemastore.org/component-detection-manifest.json",
},
{
"fileMatch": [
@@ -65,6 +65,7 @@
"git.ignoreLimitWarning": true,
"git.branchProtection": [
"main",
"distro",
"release/*"
],
"git.branchProtectionPrompt": "alwaysCommitToNewBranch",
4 changes: 2 additions & 2 deletions code/ThirdPartyNotices.txt
Original file line number Diff line number Diff line change
@@ -9,7 +9,7 @@ This project incorporates components from the projects listed below. The origina
2. atom/language-coffee-script version 0.49.3 (https://github.com/atom/language-coffee-script)
3. atom/language-css version 0.45.1 (https://github.com/atom/language-css)
4. atom/language-java version 0.32.1 (https://github.com/atom/language-java)
5. atom/language-sass version 0.62.1 (https://github.com/atom/language-sass)
5. atom/language-sass version 0.61.4 (https://github.com/atom/language-sass)
6. atom/language-shellscript version 0.28.2 (https://github.com/atom/language-shellscript)
7. atom/language-xml version 0.35.2 (https://github.com/atom/language-xml)
8. better-go-syntax version 1.0.0 (https://github.com/jeff-hykin/better-go-syntax/ )
@@ -42,7 +42,7 @@ This project incorporates components from the projects listed below. The origina
35. language-less version 0.34.2 (https://github.com/atom/language-less)
36. language-php version 0.48.1 (https://github.com/atom/language-php)
37. MagicStack/MagicPython version 1.1.1 (https://github.com/MagicStack/MagicPython)
38. marked version 4.0.16 (https://github.com/markedjs/marked)
38. marked version 4.1.0 (https://github.com/markedjs/marked)
39. mdn-data version 1.1.12 (https://github.com/mdn/data)
40. microsoft/TypeScript-TmLanguage version 0.0.1 (https://github.com/microsoft/TypeScript-TmLanguage)
41. microsoft/vscode-JSON.tmLanguage (https://github.com/microsoft/vscode-JSON.tmLanguage)
10 changes: 7 additions & 3 deletions code/build/.moduleignore
Original file line number Diff line number Diff line change
@@ -1,9 +1,13 @@
# cleanup rules for node modules, .gitignore style

# native node modules

nan/**
*/node_modules/nan/**
**/node_modules/nan/**
node-gyp/**
**/node_modules/node-gyp/**
node-gyp-build/**
**/node_modules/node-gyp-build/**
node-addon-api/**
**/node_modules/node-addon-api/**

fsevents/binding.gyp
fsevents/fsevents.cc
25 changes: 5 additions & 20 deletions code/build/azure-pipelines/product-build-pr.yml
Original file line number Diff line number Diff line change
@@ -26,10 +26,7 @@ jobs:
- ${{ if ne(variables['VSCODE_CIBUILD'], true) }}:
- job: Compile
displayName: Compile & Hygiene
pool:
name: vscode-1es-vscode-linux-20.04
demands:
- ImageVersionOverride -equals 40.0.0
pool: vscode-1es-vscode-linux-20.04
timeoutInMinutes: 30
variables:
VSCODE_ARCH: x64
@@ -40,10 +37,7 @@ jobs:

- job: Linuxx64UnitTest
displayName: Linux (Unit Tests)
pool:
name: vscode-1es-vscode-linux-20.04
demands:
- ImageVersionOverride -equals 40.0.0
pool: vscode-1es-vscode-linux-20.04
timeoutInMinutes: 30
variables:
VSCODE_ARCH: x64
@@ -60,10 +54,7 @@ jobs:

- job: Linuxx64IntegrationTest
displayName: Linux (Integration Tests)
pool:
name: vscode-1es-vscode-linux-20.04
demands:
- ImageVersionOverride -equals 40.0.0
pool: vscode-1es-vscode-linux-20.04
timeoutInMinutes: 30
variables:
VSCODE_ARCH: x64
@@ -80,10 +71,7 @@ jobs:

- job: Linuxx64SmokeTest
displayName: Linux (Smoke Tests)
pool:
name: vscode-1es-vscode-linux-20.04
demands:
- ImageVersionOverride -equals 40.0.0
pool: vscode-1es-vscode-linux-20.04
timeoutInMinutes: 30
variables:
VSCODE_ARCH: x64
@@ -101,10 +89,7 @@ jobs:
- ${{ if eq(variables['VSCODE_CIBUILD'], true) }}:
- job: Linuxx64MaintainNodeModulesCache
displayName: Linux (Maintain node_modules cache)
pool:
name: vscode-1es-vscode-linux-20.04
demands:
- ImageVersionOverride -equals 40.0.0
pool: vscode-1es-vscode-linux-20.04
timeoutInMinutes: 30
variables:
VSCODE_ARCH: x64
18 changes: 18 additions & 0 deletions code/build/azure-pipelines/product-build.yml
Original file line number Diff line number Diff line change
@@ -593,10 +593,28 @@ stages:
steps:
- template: product-publish.yml

- ${{ if and(parameters.VSCODE_RELEASE, eq(parameters.VSCODE_DISTRO_REF, ' ')) }}:
- stage: ApproveRelease
dependsOn: [] # run in parallel to compile stage
pool: vscode-1es-linux
jobs:
- deployment: ApproveRelease
displayName: "Approve Release"
environment: "vscode"
variables:
skipComponentGovernanceDetection: true
strategy:
runOnce:
deploy:
steps:
- checkout: none

- ${{ if or(and(parameters.VSCODE_RELEASE, eq(parameters.VSCODE_DISTRO_REF, ' ')), and(in(parameters.VSCODE_QUALITY, 'insider', 'exploration'), eq(variables['VSCODE_SCHEDULEDBUILD'], true))) }}:
- stage: Release
dependsOn:
- Publish
- ${{ if and(parameters.VSCODE_RELEASE, eq(parameters.VSCODE_DISTRO_REF, ' ')) }}:
- ApproveRelease
pool: vscode-1es-linux
jobs:
- job: ReleaseBuild
2 changes: 1 addition & 1 deletion code/build/gulpfile.extensions.js
Original file line number Diff line number Diff line change
@@ -53,7 +53,6 @@ const compilations = [
'gulp/tsconfig.json',
'html-language-features/client/tsconfig.json',
'html-language-features/server/tsconfig.json',
'image-preview/tsconfig.json',
'ipynb/tsconfig.json',
'jake/tsconfig.json',
'json-language-features/client/tsconfig.json',
@@ -62,6 +61,7 @@ const compilations = [
'markdown-language-features/server/tsconfig.json',
'markdown-language-features/tsconfig.json',
'markdown-math/tsconfig.json',
'media-preview/tsconfig.json',
'merge-conflict/tsconfig.json',
'microsoft-authentication/tsconfig.json',
'npm/tsconfig.json',
2 changes: 1 addition & 1 deletion code/build/npm/dirs.js
Original file line number Diff line number Diff line change
@@ -30,14 +30,14 @@ exports.dirs = [
'extensions/gulp',
'extensions/html-language-features',
'extensions/html-language-features/server',
'extensions/image-preview',
'extensions/ipynb',
'extensions/jake',
'extensions/json-language-features',
'extensions/json-language-features/server',
'extensions/markdown-language-features/server',
'extensions/markdown-language-features',
'extensions/markdown-math',
'extensions/media-preview',
'extensions/merge-conflict',
'extensions/microsoft-authentication',
'extensions/notebook-renderers',
19 changes: 19 additions & 0 deletions code/build/win32/Cargo.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
[package]
name = "inno_updater"
version = "0.9.0"
authors = ["Microsoft <monacotools@microsoft.com>"]
build = "build.rs"

[dependencies]
byteorder = "1"
crc = "^1.0.0"
slog = "2.1.1"
slog-async = "2.2.0"
slog-term = "2.3.0"

[target.'cfg(windows)'.dependencies]
winapi = { version = "^0.3.9", features = ["winuser", "libloaderapi", "commctrl", "processthreadsapi", "tlhelp32", "handleapi", "psapi", "errhandlingapi", "winbase", "shellapi"] }

[profile.release]
lto = true
panic = 'abort'
Loading