mirror of
https://github.com/ckaczor/azuredatastudio.git
synced 2026-02-10 18:22:34 -05:00
Merge from vscode 2cfc8172e533e50c90e6a3152f6bfb1f82f963f3 (#6516)
* Merge from vscode 2cfc8172e533e50c90e6a3152f6bfb1f82f963f3 * fix tests
This commit is contained in:
Anthony Dresser
@@ -1 +0,0 @@
|
||||
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><style>.st0{opacity:0}.st0,.st1{fill:#f6f6f6}.st2{fill:#424242}</style><g id="outline"><path class="st0" d="M0 0h16v16H0z"/><path class="st1" d="M16 3H9v.445c-.034-.07-.062-.145-.1-.21a2.318 2.318 0 0 0-.759-.793C7.81 2.229 7 2.117 7 2.109V0H4v2.438c-.078-.042-.15-.092-.233-.125a2.685 2.685 0 0 0-1.013-.188c-.184 0-.392.016-.619.055a5.422 5.422 0 0 0-.506.115c-.149.045-.337.096-.493.162-.173.077-.39.151-.533.25L0 3.006v3.17c0 .297.045.56.136.821.1.291.255.525.454.736.207.224.462.351.75.467.065.027.137.026.205.039a2.827 2.827 0 0 0-.651.532 3.064 3.064 0 0 0-.6 1.061 3.81 3.81 0 0 0-.188 1.21c0 .402.062.784.185 1.137.132.377.323.709.562.978a2.748 2.748 0 0 0 2.131.942c.333 0 .595-.042.876-.13a2.61 2.61 0 0 0 .678-.333L5 13.225v-1.811L8.586 15h4.828l-2-2H16V3zM5 10.586V8.523l-.556-.404c-.081-.043-.152-.083-.228-.119h1.96c.196 0 .409.266.634.266.187 0 .366-.007.538-.029L5 10.586z"/></g><g id="icon_x5F_bg"><path class="st2" d="M10 4v2h3v4H9l2-2H9l-3 3 3 3h2l-2-2h6V4zM3.869 3.568a1.21 1.21 0 0 0-.473-.329c-.274-.111-.623-.15-1.055-.076a3.5 3.5 0 0 0-.711.208 1.501 1.501 0 0 0-.234.125l-.043.03v1.056l.168-.139c.149-.124.326-.225.527-.303.196-.074.399-.113.604-.113.188 0 .33.051.431.157.087.095.137.248.147.456l-.962.144c-.219.03-.41.086-.57.166a1.245 1.245 0 0 0-.398.311 1.234 1.234 0 0 0-.229.426 1.714 1.714 0 0 0 .011 1.008 1.096 1.096 0 0 0 .638.67c.155.063.328.093.528.093a1.25 1.25 0 0 0 .978-.441v.345h1.007V4.769c0-.255-.03-.484-.089-.681a1.423 1.423 0 0 0-.275-.52zm-.636 1.896V5.7c0 .119-.018.231-.055.341a.745.745 0 0 1-.377.447.694.694 0 0 1-.512.027.454.454 0 0 1-.156-.094.389.389 0 0 1-.094-.139.474.474 0 0 1-.035-.186c0-.077.009-.147.024-.212a.33.33 0 0 1 .078-.141.436.436 0 0 1 .161-.109 1.3 1.3 0 0 1 .305-.073l.661-.097zM8.284 4.397a2.253 2.253 0 0 0-.244-.656 1.354 1.354 0 0 0-.436-.459 1.165 1.165 0 0 0-.642-.173 1.136 1.136 0 0 0-.69.223 1.312 1.312 0 0 0-.264.266V1.119H5.09v6.224h.918v-.281a1.023 1.023 0 0 0 .472.328c.098.032.208.047.33.047.255 0 .483-.06.677-.177.192-.115.355-.278.486-.486a2.29 2.29 0 0 0 .293-.718 3.87 3.87 0 0 0 .096-.886 3.76 3.76 0 0 0-.078-.773zm-.861.758c0 .232-.02.439-.059.613-.036.172-.09.315-.159.424a.639.639 0 0 1-.233.237.582.582 0 0 1-.565.014.683.683 0 0 1-.211-.183.925.925 0 0 1-.141-.283 1.187 1.187 0 0 1-.054-.358v-.517c0-.164.02-.314.059-.447.037-.132.088-.242.157-.336a.668.668 0 0 1 .228-.208.584.584 0 0 1 .289-.071.554.554 0 0 1 .497.279c.063.099.108.214.143.354.031.143.049.306.049.482zM2.409 10.019a.913.913 0 0 1 .316-.239c.218-.1.547-.105.766-.018.104.042.204.1.32.184l.329.26V9.064l-.096-.062a1.932 1.932 0 0 0-.905-.215c-.308 0-.593.057-.846.168-.25.11-.467.27-.647.475a2.072 2.072 0 0 0-.403.717c-.09.272-.137.57-.137.895 0 .289.043.561.129.808.087.249.212.471.374.652.161.185.361.333.597.441.232.104.493.155.778.155.233 0 .434-.028.613-.084a1.85 1.85 0 0 0 .466-.217l.078-.061v-.889l-.2.095a.402.402 0 0 1-.076.026c-.05.017-.099.035-.128.049-.036.023-.227.09-.227.09-.06.024-.14.043-.218.059a.977.977 0 0 1-.599-.057.827.827 0 0 1-.306-.225 1.088 1.088 0 0 1-.205-.376 1.728 1.728 0 0 1-.076-.529c0-.21.028-.399.083-.56.054-.158.129-.294.22-.4z"/></g></svg>
|
||||
|
Before Width: | Height: | Size: 3.1 KiB |
@@ -288,7 +288,10 @@ MenuRegistry.appendMenuItem(MenuId.EditorTitle, {
|
||||
command: {
|
||||
id: TOGGLE_WORD_WRAP_ID,
|
||||
title: nls.localize('unwrapMinified', "Disable wrapping for this file"),
|
||||
iconLocation: { dark: URI.parse(require.toUrl('vs/workbench/contrib/codeEditor/browser/WordWrap_16x.svg')) }
|
||||
iconLocation: {
|
||||
dark: URI.parse(require.toUrl('vs/workbench/contrib/codeEditor/browser/word-wrap-dark.svg')),
|
||||
light: URI.parse(require.toUrl('vs/workbench/contrib/codeEditor/browser/word-wrap-light.svg'))
|
||||
}
|
||||
},
|
||||
group: 'navigation',
|
||||
order: 1,
|
||||
@@ -302,7 +305,10 @@ MenuRegistry.appendMenuItem(MenuId.EditorTitle, {
|
||||
command: {
|
||||
id: TOGGLE_WORD_WRAP_ID,
|
||||
title: nls.localize('wrapMinified', "Enable wrapping for this file"),
|
||||
iconLocation: { dark: URI.parse(require.toUrl('vs/workbench/contrib/codeEditor/browser/WordWrap_16x.svg')) }
|
||||
iconLocation: {
|
||||
dark: URI.parse(require.toUrl('vs/workbench/contrib/codeEditor/browser/word-wrap-dark.svg')),
|
||||
light: URI.parse(require.toUrl('vs/workbench/contrib/codeEditor/browser/word-wrap-light.svg'))
|
||||
}
|
||||
},
|
||||
group: 'navigation',
|
||||
order: 1,
|
||||
|
||||
@@ -0,0 +1,3 @@
|
||||
<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
|
||||
<path fill-rule="evenodd" clip-rule="evenodd" d="M3.86838 3.449C3.73951 3.30285 3.57724 3.18998 3.39538 3.12C3.12138 3.009 2.77238 2.97 2.34038 3.044C2.09669 3.08799 1.85836 3.15771 1.62938 3.252C1.54785 3.28668 1.46954 3.32851 1.39538 3.377L1.35238 3.407V4.463L1.52038 4.324C1.66938 4.2 1.84638 4.099 2.04738 4.021C2.24338 3.947 2.44638 3.908 2.65138 3.908C2.83938 3.908 2.98138 3.959 3.08238 4.065C3.16938 4.16 3.21938 4.313 3.22938 4.521L2.26738 4.665C2.04838 4.695 1.85738 4.751 1.69738 4.831C1.54486 4.90638 1.40941 5.01223 1.29938 5.142C1.1957 5.2675 1.11787 5.41228 1.07038 5.568C0.972926 5.89751 0.976758 6.2487 1.08138 6.576C1.13245 6.72744 1.21601 6.86588 1.32622 6.98162C1.43643 7.09736 1.57062 7.18759 1.71938 7.246C1.87438 7.309 2.04738 7.339 2.24738 7.339C2.43291 7.3427 2.61694 7.30504 2.7861 7.22876C2.95526 7.15248 3.10532 7.03949 3.22538 6.898V7.243H4.23238V4.65C4.23238 4.395 4.20238 4.166 4.14338 3.969C4.08893 3.7784 3.99527 3.60129 3.86838 3.449ZM3.23238 5.345V5.581C3.23238 5.7 3.21438 5.812 3.17738 5.922C3.14794 6.01808 3.09936 6.10722 3.03457 6.18403C2.96978 6.26085 2.89012 6.32377 2.80038 6.369C2.63942 6.44302 2.45624 6.45268 2.28838 6.396C2.23057 6.37553 2.1775 6.34355 2.13238 6.302C2.09131 6.26306 2.05923 6.21562 2.03838 6.163C2.01433 6.10398 2.00243 6.04072 2.00338 5.977C2.00338 5.9 2.01238 5.83 2.02738 5.765C2.04133 5.71228 2.06813 5.66383 2.10538 5.624C2.15016 5.57601 2.2052 5.53875 2.26638 5.515C2.36473 5.47845 2.46714 5.45394 2.57138 5.442L3.23238 5.345ZM8.28338 4.278C8.23672 4.04796 8.15439 3.82662 8.03938 3.622C7.93236 3.4367 7.78294 3.2794 7.60338 3.163C7.41073 3.04419 7.18764 2.98408 6.96138 2.99C6.7132 2.98696 6.47084 3.06528 6.27138 3.213C6.17111 3.28858 6.0822 3.37816 6.00738 3.479V1H5.08938V7.224H6.00738V6.943C6.13014 7.09519 6.29394 7.20902 6.47938 7.271C6.57738 7.303 6.68738 7.318 6.80938 7.318C7.06438 7.318 7.29238 7.258 7.48638 7.141C7.67838 7.026 7.84138 6.863 7.97238 6.655C8.11016 6.43406 8.20924 6.19125 8.26538 5.937C8.33139 5.64635 8.36361 5.34904 8.36138 5.051C8.36214 4.79133 8.336 4.53228 8.28338 4.278ZM7.42238 5.036C7.42238 5.268 7.40238 5.475 7.36338 5.649C7.32738 5.821 7.27338 5.964 7.20438 6.073C7.14898 6.17117 7.06859 6.25293 6.97138 6.31C6.88615 6.36014 6.78955 6.38774 6.6907 6.39019C6.59184 6.39264 6.49399 6.36986 6.40638 6.324C6.32419 6.27819 6.25236 6.21588 6.19538 6.141C6.13249 6.05546 6.08479 5.95973 6.05438 5.858C6.01818 5.74213 5.99997 5.62139 6.00038 5.5V4.983C6.00038 4.819 6.02038 4.669 6.05938 4.536C6.09638 4.404 6.14738 4.294 6.21638 4.2C6.2751 4.11382 6.35319 4.04259 6.44438 3.992C6.53297 3.94377 6.63253 3.91931 6.73338 3.921C6.83373 3.91811 6.93297 3.94254 7.02051 3.99168C7.10805 4.04083 7.18059 4.11283 7.23038 4.2C7.29338 4.299 7.33838 4.414 7.37338 4.554C7.40438 4.697 7.42238 4.86 7.42238 5.036ZM2.40838 9.9C2.49495 9.79816 2.60282 9.71657 2.72438 9.661C2.94238 9.561 3.27138 9.556 3.49038 9.643C3.59438 9.685 3.69438 9.743 3.81038 9.827L4.13938 10.087V8.945L4.04338 8.883C3.76373 8.7387 3.45306 8.66489 3.13838 8.668C2.83038 8.668 2.54538 8.725 2.29238 8.836C2.04238 8.946 1.82538 9.106 1.64538 9.311C1.46449 9.52067 1.32745 9.76447 1.24238 10.028C1.15238 10.3 1.10538 10.598 1.10538 10.923C1.10538 11.212 1.14838 11.484 1.23438 11.731C1.32138 11.98 1.44638 12.202 1.60838 12.383C1.76938 12.568 1.96938 12.716 2.20538 12.824C2.43738 12.928 2.69838 12.979 2.98338 12.979C3.21638 12.979 3.41738 12.951 3.59638 12.895C3.76106 12.8447 3.9179 12.7717 4.06238 12.678L4.14038 12.617V11.728L3.94038 11.823C3.91598 11.8342 3.89052 11.8429 3.86438 11.849C3.81438 11.866 3.76538 11.884 3.73638 11.898C3.70038 11.921 3.50938 11.988 3.50938 11.988C3.44938 12.012 3.36938 12.031 3.29138 12.047C3.09069 12.0915 2.88108 12.0715 2.69238 11.99C2.57431 11.9398 2.46955 11.8627 2.38638 11.765C2.29381 11.6545 2.22413 11.5267 2.18138 11.389C2.12877 11.2177 2.10313 11.0392 2.10538 10.86C2.10538 10.65 2.13338 10.461 2.18838 10.3C2.24238 10.142 2.31738 10.006 2.40838 9.9ZM14 6H10V5H14.5L15 5.5V11.5L14.5 12H7.87869L9.94976 14.0711L9.24265 14.7782L6.35356 11.8891V11.182L9.24265 8.2929L9.94976 9L7.94975 11H14V6Z" fill="#C5C5C5"/>
|
||||
</svg>
|
||||
|
After Width: | Height: | Size: 4.1 KiB |
@@ -0,0 +1,3 @@
|
||||
<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
|
||||
<path fill-rule="evenodd" clip-rule="evenodd" d="M3.86838 3.449C3.73951 3.30285 3.57724 3.18998 3.39538 3.12C3.12138 3.009 2.77238 2.97 2.34038 3.044C2.09669 3.08799 1.85836 3.15771 1.62938 3.252C1.54785 3.28668 1.46954 3.32851 1.39538 3.377L1.35238 3.407V4.463L1.52038 4.324C1.66938 4.2 1.84638 4.099 2.04738 4.021C2.24338 3.947 2.44638 3.908 2.65138 3.908C2.83938 3.908 2.98138 3.959 3.08238 4.065C3.16938 4.16 3.21938 4.313 3.22938 4.521L2.26738 4.665C2.04838 4.695 1.85738 4.751 1.69738 4.831C1.54486 4.90638 1.40941 5.01223 1.29938 5.142C1.1957 5.2675 1.11787 5.41228 1.07038 5.568C0.972926 5.89751 0.976758 6.2487 1.08138 6.576C1.13245 6.72744 1.21601 6.86588 1.32622 6.98162C1.43643 7.09736 1.57062 7.18759 1.71938 7.246C1.87438 7.309 2.04738 7.339 2.24738 7.339C2.43291 7.3427 2.61694 7.30504 2.7861 7.22876C2.95526 7.15248 3.10532 7.03949 3.22538 6.898V7.243H4.23238V4.65C4.23238 4.395 4.20238 4.166 4.14338 3.969C4.08893 3.7784 3.99527 3.60129 3.86838 3.449ZM3.23238 5.345V5.581C3.23238 5.7 3.21438 5.812 3.17738 5.922C3.14794 6.01808 3.09936 6.10722 3.03457 6.18403C2.96978 6.26085 2.89012 6.32377 2.80038 6.369C2.63942 6.44302 2.45624 6.45268 2.28838 6.396C2.23057 6.37553 2.1775 6.34355 2.13238 6.302C2.09131 6.26306 2.05923 6.21562 2.03838 6.163C2.01433 6.10398 2.00243 6.04072 2.00338 5.977C2.00338 5.9 2.01238 5.83 2.02738 5.765C2.04133 5.71228 2.06813 5.66383 2.10538 5.624C2.15016 5.57601 2.2052 5.53875 2.26638 5.515C2.36473 5.47845 2.46714 5.45394 2.57138 5.442L3.23238 5.345ZM8.28338 4.278C8.23672 4.04796 8.15439 3.82662 8.03938 3.622C7.93236 3.4367 7.78294 3.2794 7.60338 3.163C7.41073 3.04419 7.18764 2.98408 6.96138 2.99C6.7132 2.98696 6.47084 3.06528 6.27138 3.213C6.17111 3.28858 6.0822 3.37816 6.00738 3.479V1H5.08938V7.224H6.00738V6.943C6.13014 7.09519 6.29394 7.20902 6.47938 7.271C6.57738 7.303 6.68738 7.318 6.80938 7.318C7.06438 7.318 7.29238 7.258 7.48638 7.141C7.67838 7.026 7.84138 6.863 7.97238 6.655C8.11016 6.43406 8.20924 6.19125 8.26538 5.937C8.33139 5.64635 8.36361 5.34904 8.36138 5.051C8.36214 4.79133 8.336 4.53228 8.28338 4.278ZM7.42238 5.036C7.42238 5.268 7.40238 5.475 7.36338 5.649C7.32738 5.821 7.27338 5.964 7.20438 6.073C7.14898 6.17117 7.06859 6.25293 6.97138 6.31C6.88615 6.36014 6.78955 6.38774 6.6907 6.39019C6.59184 6.39264 6.49399 6.36986 6.40638 6.324C6.32419 6.27819 6.25236 6.21588 6.19538 6.141C6.13249 6.05546 6.08479 5.95973 6.05438 5.858C6.01818 5.74213 5.99997 5.62139 6.00038 5.5V4.983C6.00038 4.819 6.02038 4.669 6.05938 4.536C6.09638 4.404 6.14738 4.294 6.21638 4.2C6.2751 4.11382 6.35319 4.04259 6.44438 3.992C6.53297 3.94377 6.63253 3.91931 6.73338 3.921C6.83373 3.91811 6.93297 3.94254 7.02051 3.99168C7.10805 4.04083 7.18059 4.11283 7.23038 4.2C7.29338 4.299 7.33838 4.414 7.37338 4.554C7.40438 4.697 7.42238 4.86 7.42238 5.036ZM2.40838 9.9C2.49495 9.79816 2.60282 9.71657 2.72438 9.661C2.94238 9.561 3.27138 9.556 3.49038 9.643C3.59438 9.685 3.69438 9.743 3.81038 9.827L4.13938 10.087V8.945L4.04338 8.883C3.76373 8.7387 3.45306 8.66489 3.13838 8.668C2.83038 8.668 2.54538 8.725 2.29238 8.836C2.04238 8.946 1.82538 9.106 1.64538 9.311C1.46449 9.52067 1.32745 9.76447 1.24238 10.028C1.15238 10.3 1.10538 10.598 1.10538 10.923C1.10538 11.212 1.14838 11.484 1.23438 11.731C1.32138 11.98 1.44638 12.202 1.60838 12.383C1.76938 12.568 1.96938 12.716 2.20538 12.824C2.43738 12.928 2.69838 12.979 2.98338 12.979C3.21638 12.979 3.41738 12.951 3.59638 12.895C3.76106 12.8447 3.9179 12.7717 4.06238 12.678L4.14038 12.617V11.728L3.94038 11.823C3.91598 11.8342 3.89052 11.8429 3.86438 11.849C3.81438 11.866 3.76538 11.884 3.73638 11.898C3.70038 11.921 3.50938 11.988 3.50938 11.988C3.44938 12.012 3.36938 12.031 3.29138 12.047C3.09069 12.0915 2.88108 12.0715 2.69238 11.99C2.57431 11.9398 2.46955 11.8627 2.38638 11.765C2.29381 11.6545 2.22413 11.5267 2.18138 11.389C2.12877 11.2177 2.10313 11.0392 2.10538 10.86C2.10538 10.65 2.13338 10.461 2.18838 10.3C2.24238 10.142 2.31738 10.006 2.40838 9.9ZM14 6H10V5H14.5L15 5.5V11.5L14.5 12H7.87869L9.94976 14.0711L9.24265 14.7782L6.35356 11.8891V11.182L9.24265 8.2929L9.94976 9L7.94975 11H14V6Z" fill="#424242"/>
|
||||
</svg>
|
||||
|
After Width: | Height: | Size: 4.1 KiB |
Reference in New Issue
Block a user