Skip to content

Commit

Permalink
Rebase against the upstream 1435b36
Browse files Browse the repository at this point in the history
vscode-upstream-sha1: 1435b36
  • Loading branch information
Eclipse Che Sync committed Jun 25, 2024
2 parents 7355774 + 1435b36 commit da50c7e
Show file tree
Hide file tree
Showing 25 changed files with 646 additions and 521 deletions.
6 changes: 6 additions & 0 deletions code/.github/workflows/on-open.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ jobs:
token: ${{secrets.VSCODE_ISSUE_TRIAGE_BOT_PAT}}

- name: Run CopyCat (VSCodeTriageBot/testissues)
if: github.event.issue.user.login != 'ghost'
uses: ./actions/copycat
with:
appInsightsKey: ${{secrets.TRIAGE_ACTIONS_APP_INSIGHTS}}
Expand All @@ -30,6 +31,7 @@ jobs:
repo: testissues

- name: Run New Release
if: github.event.issue.user.login != 'ghost'
uses: ./actions/new-release
with:
label: new release
Expand All @@ -41,6 +43,7 @@ jobs:
days: 5

- name: Run Clipboard Labeler
if: github.event.issue.user.login != 'ghost'
uses: ./actions/regex-labeler
with:
appInsightsKey: ${{secrets.TRIAGE_ACTIONS_APP_INSIGHTS}}
Expand All @@ -49,6 +52,7 @@ jobs:
comment: "It looks like you're using the VS Code Issue Reporter but did not paste the text generated into the created issue. We've closed this issue, please open a new one containing the text we placed in your clipboard.\n\nHappy Coding!"

- name: Run Clipboard Labeler (Chinese)
if: github.event.issue.user.login != 'ghost'
uses: ./actions/regex-labeler
with:
appInsightsKey: ${{secrets.TRIAGE_ACTIONS_APP_INSIGHTS}}
Expand All @@ -58,6 +62,7 @@ jobs:

# source of truth in ./english-please.yml
- name: Run English Please
if: github.event.issue.user.login != 'ghost'
uses: ./actions/english-please
with:
token: ${{secrets.VSCODE_ISSUE_TRIAGE_BOT_PAT}}
Expand All @@ -69,6 +74,7 @@ jobs:
translatorRequestedLabelColor: "c29cff"
# source of truth in ./test-plan-item-validator.yml
- name: Run Test Plan Item Validator
if: github.event.issue.user.login != 'ghost'
uses: ./actions/test-plan-item-validator
with:
token: ${{secrets.VSCODE_ISSUE_TRIAGE_BOT_PAT}}
Expand Down
4 changes: 2 additions & 2 deletions code/ThirdPartyNotices.txt
Original file line number Diff line number Diff line change
Expand Up @@ -517,7 +517,7 @@ to the base-name name of the original file, and an extension of txt, html, or si

---------------------------------------------------------

go-syntax 0.6.6 - MIT
go-syntax 0.6.8 - MIT
https://github.com/worlpaker/go-syntax

MIT License
Expand Down Expand Up @@ -833,7 +833,7 @@ SOFTWARE.

---------------------------------------------------------

jlelong/vscode-latex-basics 1.7.0 - MIT
jlelong/vscode-latex-basics 1.9.0 - MIT
https://github.com/jlelong/vscode-latex-basics

Copyright (c) vscode-latex-basics authors
Expand Down
175 changes: 10 additions & 165 deletions code/cli/ThirdPartyNotices.txt
Original file line number Diff line number Diff line change
Expand Up @@ -1341,7 +1341,7 @@ SOFTWARE.
---------------------------------------------------------

clap_derive 4.5.4 - MIT OR Apache-2.0
https://github.com/clap-rs/clap/tree/master/clap_derive
https://github.com/clap-rs/clap

Copyright (c) Individual contributors

Expand All @@ -1367,7 +1367,7 @@ SOFTWARE.
---------------------------------------------------------

clap_lex 0.7.0 - MIT OR Apache-2.0
https://github.com/clap-rs/clap/tree/master/clap_lex
https://github.com/clap-rs/clap

Copyright (c) Individual contributors

Expand Down Expand Up @@ -3428,7 +3428,7 @@ DEALINGS IN THE SOFTWARE.
httparse 1.8.0 - MIT/Apache-2.0
https://github.com/seanmonstar/httparse

Copyright (c) 2015-2021 Sean McArthur
Copyright (c) 2015-2024 Sean McArthur

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down Expand Up @@ -8507,6 +8507,7 @@ subtle 2.5.0 - BSD-3-Clause
https://github.com/dalek-cryptography/subtle

Copyright (c) 2016-2017 Isis Agora Lovecruft, Henry de Valence. All rights reserved.
Copyright (c) 2016-2024 Isis Agora Lovecruft. All rights reserved.

Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are
Expand Down Expand Up @@ -10790,101 +10791,23 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
zbus 3.15.2 - MIT
https://github.com/dbus2/zbus/

The MIT License (MIT)

Copyright (c) 2024 Zeeshan Ali Khan & zbus contributors

Permission is hereby granted, free of charge, to any
person obtaining a copy of this software and associated
documentation files (the "Software"), to deal in the
Software without restriction, including without
limitation the rights to use, copy, modify, merge,
publish, distribute, sublicense, and/or sell copies of
the Software, and to permit persons to whom the Software
is furnished to do so, subject to the following
conditions:

The above copyright notice and this permission notice
shall be included in all copies or substantial portions
of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF
ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT
SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR
IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
DEALINGS IN THE SOFTWARE.
LICENSE-MIT
---------------------------------------------------------

---------------------------------------------------------

zbus_macros 3.15.2 - MIT
https://github.com/dbus2/zbus/

The MIT License (MIT)

Copyright (c) 2024 Zeeshan Ali Khan & zbus contributors

Permission is hereby granted, free of charge, to any
person obtaining a copy of this software and associated
documentation files (the "Software"), to deal in the
Software without restriction, including without
limitation the rights to use, copy, modify, merge,
publish, distribute, sublicense, and/or sell copies of
the Software, and to permit persons to whom the Software
is furnished to do so, subject to the following
conditions:

The above copyright notice and this permission notice
shall be included in all copies or substantial portions
of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF
ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT
SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR
IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
DEALINGS IN THE SOFTWARE.
LICENSE-MIT
---------------------------------------------------------

---------------------------------------------------------

zbus_names 2.6.1 - MIT
https://github.com/dbus2/zbus/

The MIT License (MIT)

Copyright (c) 2024 Zeeshan Ali Khan & zbus contributors

Permission is hereby granted, free of charge, to any
person obtaining a copy of this software and associated
documentation files (the "Software"), to deal in the
Software without restriction, including without
limitation the rights to use, copy, modify, merge,
publish, distribute, sublicense, and/or sell copies of
the Software, and to permit persons to whom the Software
is furnished to do so, subject to the following
conditions:

The above copyright notice and this permission notice
shall be included in all copies or substantial portions
of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF
ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT
SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR
IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
DEALINGS IN THE SOFTWARE.
LICENSE-MIT
---------------------------------------------------------

---------------------------------------------------------
Expand Down Expand Up @@ -10977,99 +10900,21 @@ licences; see files named LICENSE.*.txt for details.
zvariant 3.15.2 - MIT
https://github.com/dbus2/zbus/

The MIT License (MIT)

Copyright (c) 2024 Zeeshan Ali Khan & zbus contributors

Permission is hereby granted, free of charge, to any
person obtaining a copy of this software and associated
documentation files (the "Software"), to deal in the
Software without restriction, including without
limitation the rights to use, copy, modify, merge,
publish, distribute, sublicense, and/or sell copies of
the Software, and to permit persons to whom the Software
is furnished to do so, subject to the following
conditions:

The above copyright notice and this permission notice
shall be included in all copies or substantial portions
of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF
ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT
SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR
IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
DEALINGS IN THE SOFTWARE.
LICENSE-MIT
---------------------------------------------------------

---------------------------------------------------------

zvariant_derive 3.15.2 - MIT
https://github.com/dbus2/zbus/

The MIT License (MIT)

Copyright (c) 2024 Zeeshan Ali Khan & zbus contributors

Permission is hereby granted, free of charge, to any
person obtaining a copy of this software and associated
documentation files (the "Software"), to deal in the
Software without restriction, including without
limitation the rights to use, copy, modify, merge,
publish, distribute, sublicense, and/or sell copies of
the Software, and to permit persons to whom the Software
is furnished to do so, subject to the following
conditions:

The above copyright notice and this permission notice
shall be included in all copies or substantial portions
of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF
ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT
SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR
IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
DEALINGS IN THE SOFTWARE.
LICENSE-MIT
---------------------------------------------------------

---------------------------------------------------------

zvariant_utils 1.0.1 - MIT
https://github.com/dbus2/zbus/

The MIT License (MIT)

Copyright (c) 2024 Zeeshan Ali Khan & zbus contributors

Permission is hereby granted, free of charge, to any
person obtaining a copy of this software and associated
documentation files (the "Software"), to deal in the
Software without restriction, including without
limitation the rights to use, copy, modify, merge,
publish, distribute, sublicense, and/or sell copies of
the Software, and to permit persons to whom the Software
is furnished to do so, subject to the following
conditions:

The above copyright notice and this permission notice
shall be included in all copies or substantial portions
of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF
ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT
SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR
IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
DEALINGS IN THE SOFTWARE.
LICENSE-MIT
---------------------------------------------------------
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,7 @@ table > tbody > tr + tr > td {

blockquote {
margin: 0;
padding: 2px 16px 0 10px;
padding: 0px 16px 0 10px;
border-left-width: 5px;
border-left-style: solid;
border-radius: 2px;
Expand Down
2 changes: 1 addition & 1 deletion code/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "che-code",
"version": "1.91.0",
"distro": "44256034a3b5a2bbd6b12530ab050a2a3c2bd285",
"distro": "9cef7f933867933892cb3b591231ed071fe861a8",
"author": {
"name": "Microsoft Corporation"
},
Expand Down
4 changes: 4 additions & 0 deletions code/src/vs/editor/common/languageFeatureRegistry.ts
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,10 @@ export class LanguageFeatureRegistry<T> {
return result;
}

allNoModel(): T[] {
return this._entries.map(entry => entry.provider);
}

ordered(model: ITextModel): T[] {
const result: T[] = [];
this._orderedForEach(model, entry => result.push(entry.provider));
Expand Down
Loading

0 comments on commit da50c7e

Please sign in to comment.