ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-02-16 10:58:30 -05:00
Code Issues Packages Projects Releases Wiki Activity

VS Code merge to df8fe74bd55313de0dd2303bc47a4aab0ca56b0e (#17979)

Browse Source 
* Merge from vscode 504f934659740e9d41501cad9f162b54d7745ad9

* delete unused folders

* distro

* Bump build node version

* update chokidar

* FIx hygiene errors

* distro

* Fix extension lint issues

* Remove strict-vscode

* Add copyright header exemptions

* Bump vscode-extension-telemetry to fix webpacking issue with zone.js

* distro

* Fix failing tests (revert marked.js back to current one until we decide to update)

* Skip searchmodel test

* Fix mac build

* temp debug script loading

* Try disabling coverage

* log error too

* Revert "log error too"

This reverts commit af0183e5d4ab458fdf44b88fbfab9908d090526f.

* Revert "temp debug script loading"

This reverts commit 3d687d541c76db2c5b55626c78ae448d3c25089c.

* Add comments explaining coverage disabling

* Fix ansi_up loading issue

* Merge latest from ads

* Use newer option

* Fix compile

* add debug logging warn

* Always log stack

* log more

* undo debug

* Update to use correct base path (+cleanup)

* distro

* fix compile errors

* Remove strict-vscode

* Fix sql editors not showing

* Show db dropdown input & fix styling

* Fix more info in gallery

* Fix gallery asset requests

* Delete unused workflow

* Fix tapable resolutions for smoke test compile error

* Fix smoke compile

* Disable crash reporting

* Disable interactive

Co-authored-by: ADS Merger <karlb@microsoft.com>
This commit is contained in:
Charles Gagnon
2022-01-06 09:06:56 -08:00
committed by GitHub
parent fd2736b6a6
commit 2bc6a0cd01
2099 changed files with 79520 additions and 43813 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
extensions/theme-seti/build/update-icon-theme.js
View File

@@ -380,7 +380,7 @@ exports.update = function () {
}
if (preferredDef) {
lang2Def[lang] = preferredDef;
if (!nonBuiltInLanguages[lang]) {
if (!nonBuiltInLanguages[lang] && !inheritIconFromLanguage[lang]) {
for (let i2 = 0; i2 < exts.length; i2++) {
// remove the extension association, unless it is different from the preferred
if (ext2Def[exts[i2]] === preferredDef) {

2
extensions/theme-seti/cgmanifest.json
View File

@@ -6,7 +6,7 @@
"git": {
"name": "seti-ui",
"repositoryUrl": "https://github.com/jesseweed/seti-ui",
"commitHash": "e80b920f4268e5daf1f65183dae33297aa4d0d17"
"commitHash": "b484fa778f564e71c81f22ee4c006c4664d66a47"
}
},
"version": "0.1.0"

52
extensions/theme-seti/icons/vs-seti-icon-theme.json
View File

@@ -550,6 +550,14 @@
"fontCharacter": "\\E03E",
"fontColor": "#cc3e44"
},
"_hacklang_light": {
"fontCharacter": "\\E03F",
"fontColor": "#cc6d2e"
},
"_hacklang": {
"fontCharacter": "\\E03F",
"fontColor": "#e37933"
},
"_haml_light": {
"fontCharacter": "\\E040",
"fontColor": "#b8383d"
@@ -1126,14 +1134,6 @@
"fontCharacter": "\\E07B",
"fontColor": "#e37933"
},
"_react_2_light": {
"fontCharacter": "\\E07B",
"fontColor": "#b7b73b"
},
"_react_2": {
"fontCharacter": "\\E07B",
"fontColor": "#cbcb41"
},
"_reasonml_light": {
"fontCharacter": "\\E07C",
"fontColor": "#b8383d"
@@ -1216,11 +1216,11 @@
},
"_shell_light": {
"fontCharacter": "\\E087",
"fontColor": "#455155"
"fontColor": "#7fae42"
},
"_shell": {
"fontCharacter": "\\E087",
"fontColor": "#4d5a5e"
"fontColor": "#8dc149"
},
"_slim_light": {
"fontCharacter": "\\E088",
@@ -1379,11 +1379,11 @@
},
"_typescript_1_light": {
"fontCharacter": "\\E097",
"fontColor": "#b7b73b"
"fontColor": "#cc6d2e"
},
"_typescript_1": {
"fontCharacter": "\\E097",
"fontColor": "#cbcb41"
"fontColor": "#e37933"
},
"_vala_light": {
"fontCharacter": "\\E098",
@@ -1583,6 +1583,7 @@
"gql": "_graphql",
"graphql": "_graphql",
"graphqls": "_graphql",
"hack": "_hacklang",
"haml": "_haml",
"hs": "_haskell",
"lhs": "_haskell",
@@ -1612,7 +1613,6 @@
"nim": "_nim",
"nims": "_nim",
"github-issues": "_github",
// "ipynb": "_notebook", {{SQL CARBON EDIT}} Don't use VS Code Notebook icons
"njk": "_nunjucks",
"nunjucks": "_nunjucks",
"nunjs": "_nunjucks",
@@ -1639,8 +1639,8 @@
"spec.jsx": "_react_1",
"test.jsx": "_react_1",
"cjsx": "_react",
"spec.tsx": "_react_2",
"test.tsx": "_react_2",
"spec.tsx": "_react_1",
"test.tsx": "_react_1",
"re": "_reasonml",
"res": "_rescript",
"resi": "_rescript_1",
@@ -1721,9 +1721,12 @@
"bowerrc": "_bower",
"dockerignore": "_docker_1",
"codeclimate.yml": "_code-climate",
"eslintrc": "_eslint",
"eslintrc.js": "_eslint",
"eslintrc.cjs": "_eslint",
"eslintrc.yaml": "_eslint",
"eslintrc.yml": "_eslint",
"eslintrc.json": "_eslint",
"eslintignore": "_eslint_1",
"firebaserc": "_firebase",
"jshintrc": "_javascript_2",
@@ -1743,6 +1746,9 @@
"htaccess": "_config",
"key": "_lock",
"cert": "_lock",
"cer": "_lock",
"crt": "_lock",
"pem": "_lock",
"ds_store": "_ignored",
// {{SQL CARBON EDIT}}
"ipynb": "notebook_dark",
@@ -1833,6 +1839,7 @@
"handlebars": "_mustache",
"html": "_html_3",
"properties": "_java",
"jupyter": "_notebook",
"java": "_java",
"javascriptreact": "_react",
"javascript": "_javascript",
@@ -1953,6 +1960,7 @@
"gql": "_graphql_light",
"graphql": "_graphql_light",
"graphqls": "_graphql_light",
"hack": "_hacklang_light",
"haml": "_haml_light",
"hs": "_haskell_light",
"lhs": "_haskell_light",
@@ -1982,7 +1990,6 @@
"nim": "_nim_light",
"nims": "_nim_light",
"github-issues": "_github_light",
// "ipynb": "_notebook_light", {{SQL CARBON EDIT}} Don't use VS Code Notebook icons
"njk": "_nunjucks_light",
"nunjucks": "_nunjucks_light",
"nunjs": "_nunjucks_light",
@@ -2009,8 +2016,8 @@
"spec.jsx": "_react_1_light",
"test.jsx": "_react_1_light",
"cjsx": "_react_light",
"spec.tsx": "_react_2_light",
"test.tsx": "_react_2_light",
"spec.tsx": "_react_1_light",
"test.tsx": "_react_1_light",
"re": "_reasonml_light",
"res": "_rescript_light",
"resi": "_rescript_1_light",
@@ -2091,9 +2098,12 @@
"bowerrc": "_bower_light",
"dockerignore": "_docker_1_light",
"codeclimate.yml": "_code-climate_light",
"eslintrc": "_eslint_light",
"eslintrc.js": "_eslint_light",
"eslintrc.cjs": "_eslint_light",
"eslintrc.yaml": "_eslint_light",
"eslintrc.yml": "_eslint_light",
"eslintrc.json": "_eslint_light",
"eslintignore": "_eslint_1_light",
"firebaserc": "_firebase_light",
"jshintrc": "_javascript_2_light",
@@ -2113,6 +2123,9 @@
"htaccess": "_config_light",
"key": "_lock_light",
"cert": "_lock_light",
"cer": "_lock_light",
"crt": "_lock_light",
"pem": "_lock_light",
"ds_store": "_ignored_light",
// {{SQL CARBON EDIT}}
"ipynb": "notebook",
@@ -2137,6 +2150,7 @@
"handlebars": "_mustache_light",
"html": "_html_3_light",
"properties": "_java_light",
"jupyter": "_notebook_light",
"java": "_java_light",
"javascriptreact": "_react_light",
"javascript": "_javascript_light",
@@ -2259,5 +2273,5 @@
"Schema Compare": "scmp"
}
},
"version": "https://github.com/jesseweed/seti-ui/commit/e80b920f4268e5daf1f65183dae33297aa4d0d17"
"version": "https://github.com/jesseweed/seti-ui/commit/b484fa778f564e71c81f22ee4c006c4664d66a47"
}