@codingame/monaco-vscode-api 11.1.2 → 12.0.0

package/vscode/src/vs/workbench/contrib/markdown/browser/markedGfmHeadingIdPlugin.js

@@ -1,40 +0,0 @@
-const githubSlugReplaceRegex = /[\0-\x1F!-,\.\/:-@\[-\^`\{-\xA9\xAB-\xB4\xB6-\xB9\xBB-\xBF\xD7\xF7\u02C2-\u02C5\u02D2-\u02DF\u02E5-\u02EB\u02ED\u02EF-\u02FF\u0375\u0378\u0379\u037E\u0380-\u0385\u0387\u038B\u038D\u03A2\u03F6\u0482\u0530\u0557\u0558\u055A-\u055F\u0589-\u0590\u05BE\u05C0\u05C3\u05C6\u05C8-\u05CF\u05EB-\u05EE\u05F3-\u060F\u061B-\u061F\u066A-\u066D\u06D4\u06DD\u06DE\u06E9\u06FD\u06FE\u0700-\u070F\u074B\u074C\u07B2-\u07BF\u07F6-\u07F9\u07FB\u07FC\u07FE\u07FF\u082E-\u083F\u085C-\u085F\u086B-\u089F\u08B5\u08C8-\u08D2\u08E2\u0964\u0965\u0970\u0984\u098D\u098E\u0991\u0992\u09A9\u09B1\u09B3-\u09B5\u09BA\u09BB\u09C5\u09C6\u09C9\u09CA\u09CF-\u09D6\u09D8-\u09DB\u09DE\u09E4\u09E5\u09F2-\u09FB\u09FD\u09FF\u0A00\u0A04\u0A0B-\u0A0E\u0A11\u0A12\u0A29\u0A31\u0A34\u0A37\u0A3A\u0A3B\u0A3D\u0A43-\u0A46\u0A49\u0A4A\u0A4E-\u0A50\u0A52-\u0A58\u0A5D\u0A5F-\u0A65\u0A76-\u0A80\u0A84\u0A8E\u0A92\u0AA9\u0AB1\u0AB4\u0ABA\u0ABB\u0AC6\u0ACA\u0ACE\u0ACF\u0AD1-\u0ADF\u0AE4\u0AE5\u0AF0-\u0AF8\u0B00\u0B04\u0B0D\u0B0E\u0B11\u0B12\u0B29\u0B31\u0B34\u0B3A\u0B3B\u0B45\u0B46\u0B49\u0B4A\u0B4E-\u0B54\u0B58-\u0B5B\u0B5E\u0B64\u0B65\u0B70\u0B72-\u0B81\u0B84\u0B8B-\u0B8D\u0B91\u0B96-\u0B98\u0B9B\u0B9D\u0BA0-\u0BA2\u0BA5-\u0BA7\u0BAB-\u0BAD\u0BBA-\u0BBD\u0BC3-\u0BC5\u0BC9\u0BCE\u0BCF\u0BD1-\u0BD6\u0BD8-\u0BE5\u0BF0-\u0BFF\u0C0D\u0C11\u0C29\u0C3A-\u0C3C\u0C45\u0C49\u0C4E-\u0C54\u0C57\u0C5B-\u0C5F\u0C64\u0C65\u0C70-\u0C7F\u0C84\u0C8D\u0C91\u0CA9\u0CB4\u0CBA\u0CBB\u0CC5\u0CC9\u0CCE-\u0CD4\u0CD7-\u0CDD\u0CDF\u0CE4\u0CE5\u0CF0\u0CF3-\u0CFF\u0D0D\u0D11\u0D45\u0D49\u0D4F-\u0D53\u0D58-\u0D5E\u0D64\u0D65\u0D70-\u0D79\u0D80\u0D84\u0D97-\u0D99\u0DB2\u0DBC\u0DBE\u0DBF\u0DC7-\u0DC9\u0DCB-\u0DCE\u0DD5\u0DD7\u0DE0-\u0DE5\u0DF0\u0DF1\u0DF4-\u0E00\u0E3B-\u0E3F\u0E4F\u0E5A-\u0E80\u0E83\u0E85\u0E8B\u0EA4\u0EA6\u0EBE\u0EBF\u0EC5\u0EC7\u0ECE\u0ECF\u0EDA\u0EDB\u0EE0-\u0EFF\u0F01-\u0F17\u0F1A-\u0F1F\u0F2A-\u0F34\u0F36\u0F38\u0F3A-\u0F3D\u0F48\u0F6D-\u0F70\u0F85\u0F98\u0FBD-\u0FC5\u0FC7-\u0FFF\u104A-\u104F\u109E\u109F\u10C6\u10C8-\u10CC\u10CE\u10CF\u10FB\u1249\u124E\u124F\u1257\u1259\u125E\u125F\u1289\u128E\u128F\u12B1\u12B6\u12B7\u12BF\u12C1\u12C6\u12C7\u12D7\u1311\u1316\u1317\u135B\u135C\u1360-\u137F\u1390-\u139F\u13F6\u13F7\u13FE-\u1400\u166D\u166E\u1680\u169B-\u169F\u16EB-\u16ED\u16F9-\u16FF\u170D\u1715-\u171F\u1735-\u173F\u1754-\u175F\u176D\u1771\u1774-\u177F\u17D4-\u17D6\u17D8-\u17DB\u17DE\u17DF\u17EA-\u180A\u180E\u180F\u181A-\u181F\u1879-\u187F\u18AB-\u18AF\u18F6-\u18FF\u191F\u192C-\u192F\u193C-\u1945\u196E\u196F\u1975-\u197F\u19AC-\u19AF\u19CA-\u19CF\u19DA-\u19FF\u1A1C-\u1A1F\u1A5F\u1A7D\u1A7E\u1A8A-\u1A8F\u1A9A-\u1AA6\u1AA8-\u1AAF\u1AC1-\u1AFF\u1B4C-\u1B4F\u1B5A-\u1B6A\u1B74-\u1B7F\u1BF4-\u1BFF\u1C38-\u1C3F\u1C4A-\u1C4C\u1C7E\u1C7F\u1C89-\u1C8F\u1CBB\u1CBC\u1CC0-\u1CCF\u1CD3\u1CFB-\u1CFF\u1DFA\u1F16\u1F17\u1F1E\u1F1F\u1F46\u1F47\u1F4E\u1F4F\u1F58\u1F5A\u1F5C\u1F5E\u1F7E\u1F7F\u1FB5\u1FBD\u1FBF-\u1FC1\u1FC5\u1FCD-\u1FCF\u1FD4\u1FD5\u1FDC-\u1FDF\u1FED-\u1FF1\u1FF5\u1FFD-\u203E\u2041-\u2053\u2055-\u2070\u2072-\u207E\u2080-\u208F\u209D-\u20CF\u20F1-\u2101\u2103-\u2106\u2108\u2109\u2114\u2116-\u2118\u211E-\u2123\u2125\u2127\u2129\u212E\u213A\u213B\u2140-\u2144\u214A-\u214D\u214F-\u215F\u2189-\u24B5\u24EA-\u2BFF\u2C2F\u2C5F\u2CE5-\u2CEA\u2CF4-\u2CFF\u2D26\u2D28-\u2D2C\u2D2E\u2D2F\u2D68-\u2D6E\u2D70-\u2D7E\u2D97-\u2D9F\u2DA7\u2DAF\u2DB7\u2DBF\u2DC7\u2DCF\u2DD7\u2DDF\u2E00-\u2E2E\u2E30-\u3004\u3008-\u3020\u3030\u3036\u3037\u303D-\u3040\u3097\u3098\u309B\u309C\u30A0\u30FB\u3100-\u3104\u3130\u318F-\u319F\u31C0-\u31EF\u3200-\u33FF\u4DC0-\u4DFF\u9FFD-\u9FFF\uA48D-\uA4CF\uA4FE\uA4FF\uA60D-\uA60F\uA62C-\uA63F\uA673\uA67E\uA6F2-\uA716\uA720\uA721\uA789\uA78A\uA7C0\uA7C1\uA7CB-\uA7F4\uA828-\uA82B\uA82D-\uA83F\uA874-\uA87F\uA8C6-\uA8CF\uA8DA-\uA8DF\uA8F8-\uA8FA\uA8FC\uA92E\uA92F\uA954-\uA95F\uA97D-\uA97F\uA9C1-\uA9CE\uA9DA-\uA9DF\uA9FF\uAA37-\uAA3F\uAA4E\uAA4F\uAA5A-\uAA5F\uAA77-\uAA79\uAAC3-\uAADA\uAADE\uAADF\uAAF0\uAAF1\uAAF7-\uAB00\uAB07\uAB08\uAB0F\uAB10\uAB17-\uAB1F\uAB27\uAB2F\uAB5B\uAB6A-\uAB6F\uABEB\uABEE\uABEF\uABFA-\uABFF\uD7A4-\uD7AF\uD7C7-\uD7CA\uD7FC-\uD7FF\uE000-\uF8FF\uFA6E\uFA6F\uFADA-\uFAFF\uFB07-\uFB12\uFB18-\uFB1C\uFB29\uFB37\uFB3D\uFB3F\uFB42\uFB45\uFBB2-\uFBD2\uFD3E-\uFD4F\uFD90\uFD91\uFDC8-\uFDEF\uFDFC-\uFDFF\uFE10-\uFE1F\uFE30-\uFE32\uFE35-\uFE4C\uFE50-\uFE6F\uFE75\uFEFD-\uFF0F\uFF1A-\uFF20\uFF3B-\uFF3E\uFF40\uFF5B-\uFF65\uFFBF-\uFFC1\uFFC8\uFFC9\uFFD0\uFFD1\uFFD8\uFFD9\uFFDD-\uFFFF]|\uD800[\uDC0C\uDC27\uDC3B\uDC3E\uDC4E\uDC4F\uDC5E-\uDC7F\uDCFB-\uDD3F\uDD75-\uDDFC\uDDFE-\uDE7F\uDE9D-\uDE9F\uDED1-\uDEDF\uDEE1-\uDEFF\uDF20-\uDF2C\uDF4B-\uDF4F\uDF7B-\uDF7F\uDF9E\uDF9F\uDFC4-\uDFC7\uDFD0\uDFD6-\uDFFF]|\uD801[\uDC9E\uDC9F\uDCAA-\uDCAF\uDCD4-\uDCD7\uDCFC-\uDCFF\uDD28-\uDD2F\uDD64-\uDDFF\uDF37-\uDF3F\uDF56-\uDF5F\uDF68-\uDFFF]|\uD802[\uDC06\uDC07\uDC09\uDC36\uDC39-\uDC3B\uDC3D\uDC3E\uDC56-\uDC5F\uDC77-\uDC7F\uDC9F-\uDCDF\uDCF3\uDCF6-\uDCFF\uDD16-\uDD1F\uDD3A-\uDD7F\uDDB8-\uDDBD\uDDC0-\uDDFF\uDE04\uDE07-\uDE0B\uDE14\uDE18\uDE36\uDE37\uDE3B-\uDE3E\uDE40-\uDE5F\uDE7D-\uDE7F\uDE9D-\uDEBF\uDEC8\uDEE7-\uDEFF\uDF36-\uDF3F\uDF56-\uDF5F\uDF73-\uDF7F\uDF92-\uDFFF]|\uD803[\uDC49-\uDC7F\uDCB3-\uDCBF\uDCF3-\uDCFF\uDD28-\uDD2F\uDD3A-\uDE7F\uDEAA\uDEAD-\uDEAF\uDEB2-\uDEFF\uDF1D-\uDF26\uDF28-\uDF2F\uDF51-\uDFAF\uDFC5-\uDFDF\uDFF7-\uDFFF]|\uD804[\uDC47-\uDC65\uDC70-\uDC7E\uDCBB-\uDCCF\uDCE9-\uDCEF\uDCFA-\uDCFF\uDD35\uDD40-\uDD43\uDD48-\uDD4F\uDD74\uDD75\uDD77-\uDD7F\uDDC5-\uDDC8\uDDCD\uDDDB\uDDDD-\uDDFF\uDE12\uDE38-\uDE3D\uDE3F-\uDE7F\uDE87\uDE89\uDE8E\uDE9E\uDEA9-\uDEAF\uDEEB-\uDEEF\uDEFA-\uDEFF\uDF04\uDF0D\uDF0E\uDF11\uDF12\uDF29\uDF31\uDF34\uDF3A\uDF45\uDF46\uDF49\uDF4A\uDF4E\uDF4F\uDF51-\uDF56\uDF58-\uDF5C\uDF64\uDF65\uDF6D-\uDF6F\uDF75-\uDFFF]|\uD805[\uDC4B-\uDC4F\uDC5A-\uDC5D\uDC62-\uDC7F\uDCC6\uDCC8-\uDCCF\uDCDA-\uDD7F\uDDB6\uDDB7\uDDC1-\uDDD7\uDDDE-\uDDFF\uDE41-\uDE43\uDE45-\uDE4F\uDE5A-\uDE7F\uDEB9-\uDEBF\uDECA-\uDEFF\uDF1B\uDF1C\uDF2C-\uDF2F\uDF3A-\uDFFF]|\uD806[\uDC3B-\uDC9F\uDCEA-\uDCFE\uDD07\uDD08\uDD0A\uDD0B\uDD14\uDD17\uDD36\uDD39\uDD3A\uDD44-\uDD4F\uDD5A-\uDD9F\uDDA8\uDDA9\uDDD8\uDDD9\uDDE2\uDDE5-\uDDFF\uDE3F-\uDE46\uDE48-\uDE4F\uDE9A-\uDE9C\uDE9E-\uDEBF\uDEF9-\uDFFF]|\uD807[\uDC09\uDC37\uDC41-\uDC4F\uDC5A-\uDC71\uDC90\uDC91\uDCA8\uDCB7-\uDCFF\uDD07\uDD0A\uDD37-\uDD39\uDD3B\uDD3E\uDD48-\uDD4F\uDD5A-\uDD5F\uDD66\uDD69\uDD8F\uDD92\uDD99-\uDD9F\uDDAA-\uDEDF\uDEF7-\uDFAF\uDFB1-\uDFFF]|\uD808[\uDF9A-\uDFFF]|\uD809[\uDC6F-\uDC7F\uDD44-\uDFFF]|[\uD80A\uD80B\uD80E-\uD810\uD812-\uD819\uD824-\uD82B\uD82D\uD82E\uD830-\uD833\uD837\uD839\uD83D\uD83F\uD87B-\uD87D\uD87F\uD885-\uDB3F\uDB41-\uDBFF][\uDC00-\uDFFF]|\uD80D[\uDC2F-\uDFFF]|\uD811[\uDE47-\uDFFF]|\uD81A[\uDE39-\uDE3F\uDE5F\uDE6A-\uDECF\uDEEE\uDEEF\uDEF5-\uDEFF\uDF37-\uDF3F\uDF44-\uDF4F\uDF5A-\uDF62\uDF78-\uDF7C\uDF90-\uDFFF]|\uD81B[\uDC00-\uDE3F\uDE80-\uDEFF\uDF4B-\uDF4E\uDF88-\uDF8E\uDFA0-\uDFDF\uDFE2\uDFE5-\uDFEF\uDFF2-\uDFFF]|\uD821[\uDFF8-\uDFFF]|\uD823[\uDCD6-\uDCFF\uDD09-\uDFFF]|\uD82C[\uDD1F-\uDD4F\uDD53-\uDD63\uDD68-\uDD6F\uDEFC-\uDFFF]|\uD82F[\uDC6B-\uDC6F\uDC7D-\uDC7F\uDC89-\uDC8F\uDC9A-\uDC9C\uDC9F-\uDFFF]|\uD834[\uDC00-\uDD64\uDD6A-\uDD6C\uDD73-\uDD7A\uDD83\uDD84\uDD8C-\uDDA9\uDDAE-\uDE41\uDE45-\uDFFF]|\uD835[\uDC55\uDC9D\uDCA0\uDCA1\uDCA3\uDCA4\uDCA7\uDCA8\uDCAD\uDCBA\uDCBC\uDCC4\uDD06\uDD0B\uDD0C\uDD15\uDD1D\uDD3A\uDD3F\uDD45\uDD47-\uDD49\uDD51\uDEA6\uDEA7\uDEC1\uDEDB\uDEFB\uDF15\uDF35\uDF4F\uDF6F\uDF89\uDFA9\uDFC3\uDFCC\uDFCD]|\uD836[\uDC00-\uDDFF\uDE37-\uDE3A\uDE6D-\uDE74\uDE76-\uDE83\uDE85-\uDE9A\uDEA0\uDEB0-\uDFFF]|\uD838[\uDC07\uDC19\uDC1A\uDC22\uDC25\uDC2B-\uDCFF\uDD2D-\uDD2F\uDD3E\uDD3F\uDD4A-\uDD4D\uDD4F-\uDEBF\uDEFA-\uDFFF]|\uD83A[\uDCC5-\uDCCF\uDCD7-\uDCFF\uDD4C-\uDD4F\uDD5A-\uDFFF]|\uD83B[\uDC00-\uDDFF\uDE04\uDE20\uDE23\uDE25\uDE26\uDE28\uDE33\uDE38\uDE3A\uDE3C-\uDE41\uDE43-\uDE46\uDE48\uDE4A\uDE4C\uDE50\uDE53\uDE55\uDE56\uDE58\uDE5A\uDE5C\uDE5E\uDE60\uDE63\uDE65\uDE66\uDE6B\uDE73\uDE78\uDE7D\uDE7F\uDE8A\uDE9C-\uDEA0\uDEA4\uDEAA\uDEBC-\uDFFF]|\uD83C[\uDC00-\uDD2F\uDD4A-\uDD4F\uDD6A-\uDD6F\uDD8A-\uDFFF]|\uD83E[\uDC00-\uDFEF\uDFFA-\uDFFF]|\uD869[\uDEDE-\uDEFF]|\uD86D[\uDF35-\uDF3F]|\uD86E[\uDC1E\uDC1F]|\uD873[\uDEA2-\uDEAF]|\uD87A[\uDFE1-\uDFFF]|\uD87E[\uDE1E-\uDFFF]|\uD884[\uDF4B-\uDFFF]|\uDB40[\uDC00-\uDCFF\uDDF0-\uDFFF]/g;
-function slugify(heading) {
-    const slugifiedHeading = heading.trim()
-        .toLowerCase()
-        .replace(githubSlugReplaceRegex, '')
-        .replace(/\s/g, '-');
-    return slugifiedHeading;
-}
-const unescapeTest = /&(#(?:\d+)|(?:#x[0-9A-Fa-f]+)|(?:\w+));?/ig;
-function unescape(html) {
-    return html.replace(unescapeTest, (_, n) => {
-        n = n.toLowerCase();
-        if (n === 'colon') {
-            return ':';
-        }
-        if (n.charAt(0) === '#') {
-            return n.charAt(1) === 'x'
-                ? String.fromCharCode(parseInt(n.substring(2), 16))
-                : String.fromCharCode(+n.substring(1));
-        }
-        return '';
-    });
-}
-function markedGfmHeadingIdPlugin({ prefix = '', globalSlugs = false } = {}) {
-    return {
-        renderer: {
-            heading({ tokens, depth }) {
-                const text = this.parser.parseInline(tokens);
-                const raw = unescape(this.parser.parseInline(tokens, this.parser.textRenderer))
-                    .trim()
-                    .replace(/<[!\/a-z].*?>/gi, '');
-                const level = depth;
-                const id = `${prefix}${slugify(raw)}`;
-                return `<h${level} id="${id}">${text}</h${level}>\n`;
-            },
-        },
-    };
-}
-
-export { markedGfmHeadingIdPlugin };

package/vscode/src/vs/workbench/contrib/markers/common/markers.js

@@ -1,36 +0,0 @@
-import { RawContextKey } from '../../../../platform/contextkey/common/contextkey.js';
-
-var Markers;
-( (function(Markers) {
-    Markers.MARKERS_CONTAINER_ID = 'workbench.panel.markers';
-    Markers.MARKERS_VIEW_ID = 'workbench.panel.markers.view';
-    Markers.MARKERS_VIEW_STORAGE_ID = 'workbench.panel.markers';
-    Markers.MARKER_COPY_ACTION_ID = 'problems.action.copy';
-    Markers.MARKER_COPY_MESSAGE_ACTION_ID = 'problems.action.copyMessage';
-    Markers.RELATED_INFORMATION_COPY_MESSAGE_ACTION_ID = 'problems.action.copyRelatedInformationMessage';
-    Markers.FOCUS_PROBLEMS_FROM_FILTER = 'problems.action.focusProblemsFromFilter';
-    Markers.MARKERS_VIEW_FOCUS_FILTER = 'problems.action.focusFilter';
-    Markers.MARKERS_VIEW_CLEAR_FILTER_TEXT = 'problems.action.clearFilterText';
-    Markers.MARKERS_VIEW_SHOW_MULTILINE_MESSAGE = 'problems.action.showMultilineMessage';
-    Markers.MARKERS_VIEW_SHOW_SINGLELINE_MESSAGE = 'problems.action.showSinglelineMessage';
-    Markers.MARKER_OPEN_ACTION_ID = 'problems.action.open';
-    Markers.MARKER_OPEN_SIDE_ACTION_ID = 'problems.action.openToSide';
-    Markers.MARKER_SHOW_PANEL_ID = 'workbench.action.showErrorsWarnings';
-    Markers.MARKER_SHOW_QUICK_FIX = 'problems.action.showQuickFixes';
-    Markers.TOGGLE_MARKERS_VIEW_ACTION_ID = 'workbench.actions.view.toggleProblems';
-})(Markers || (Markers = {})));
-var MarkersContextKeys;
-( (function(MarkersContextKeys) {
-    MarkersContextKeys.MarkersViewModeContextKey = ( new RawContextKey('problemsViewMode', "tree" ));
-    MarkersContextKeys.MarkersTreeVisibilityContextKey = ( new RawContextKey('problemsVisibility', false));
-    MarkersContextKeys.MarkerFocusContextKey = ( new RawContextKey('problemFocus', false));
-    MarkersContextKeys.MarkerViewFilterFocusContextKey = ( new RawContextKey('problemsFilterFocus', false));
-    MarkersContextKeys.RelatedInformationFocusContextKey = ( new RawContextKey('relatedInformationFocus', false));
-    MarkersContextKeys.ShowErrorsFilterContextKey = ( new RawContextKey('problems.filter.errors', true));
-    MarkersContextKeys.ShowWarningsFilterContextKey = ( new RawContextKey('problems.filter.warnings', true));
-    MarkersContextKeys.ShowInfoFilterContextKey = ( new RawContextKey('problems.filter.info', true));
-    MarkersContextKeys.ShowActiveFileFilterContextKey = ( new RawContextKey('problems.filter.activeFile', false));
-    MarkersContextKeys.ShowExcludedFilesFilterContextKey = ( new RawContextKey('problems.filter.excludedFiles', true));
-})(MarkersContextKeys || (MarkersContextKeys = {})));
-
-export { Markers, MarkersContextKeys };

package/vscode/src/vs/workbench/contrib/mergeEditor/browser/mergeEditorInput.js

@@ -1,157 +0,0 @@
-import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
-import { assertFn } from '../../../../base/common/assert.js';
-import '../../../../base/common/arrays.js';
-import '../../../../base/common/event.js';
-import '../../../../base/common/lifecycle.js';
-import { autorun } from '../../../../base/common/observableInternal/autorun.js';
-import '../../../../base/common/observableInternal/derived.js';
-import '../../../../base/common/cancellation.js';
-import '../../../../base/common/observableInternal/utils.js';
-import { isEqual } from '../../../../base/common/resources.js';
-import { isDefined } from '../../../../base/common/types.js';
-import { ITextResourceConfigurationService } from '../../../../editor/common/services/textResourceConfiguration.js';
-import { localize } from '../../../../nls.js';
-import { IConfigurationService } from '../../../../platform/configuration/common/configuration.service.js';
-import { IFileService } from '../../../../platform/files/common/files.service.js';
-import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
-import { ILabelService } from '../../../../platform/label/common/label.service.js';
-import { DEFAULT_EDITOR_ASSOCIATION, isResourceMergeEditorInput } from '../../../common/editor.js';
-import { ICustomEditorLabelService } from '../../../services/editor/common/customEditorLabelService.service.js';
-import { AbstractTextResourceEditorInput } from '../../../common/editor/textResourceEditorInput.js';
-import { TempFileMergeEditorModeFactory, WorkspaceMergeEditorModeFactory } from './mergeEditorInputModel.js';
-import { MergeEditorTelemetry } from './telemetry.js';
-import { IEditorService } from '../../../services/editor/common/editorService.service.js';
-import { IFilesConfigurationService } from '../../../services/filesConfiguration/common/filesConfigurationService.service.js';
-import { ITextFileService } from '../../../services/textfile/common/textfiles.service.js';
-
-var MergeEditorInput_1;
-class MergeEditorInputData {
-    constructor(uri, title, detail, description) {
-        this.uri = uri;
-        this.title = title;
-        this.detail = detail;
-        this.description = description;
-    }
-}
-let MergeEditorInput = class MergeEditorInput extends AbstractTextResourceEditorInput {
-    static { MergeEditorInput_1 = this; }
-    static { this.ID = 'mergeEditor.Input'; }
-    get useWorkingCopy() {
-        return this.configurationService.getValue('mergeEditor.useWorkingCopy') ?? false;
-    }
-    constructor(base, input1, input2, result, _instaService, editorService, textFileService, labelService, fileService, configurationService, filesConfigurationService, textResourceConfigurationService, customEditorLabelService) {
-        super(result, undefined, editorService, textFileService, labelService, fileService, filesConfigurationService, textResourceConfigurationService, customEditorLabelService);
-        this.base = base;
-        this.input1 = input1;
-        this.input2 = input2;
-        this.result = result;
-        this._instaService = _instaService;
-        this.configurationService = configurationService;
-        this.closeHandler = {
-            showConfirm: () => this._inputModel?.shouldConfirmClose() ?? false,
-            confirm: async (editors) => {
-                assertFn(() => editors.every(e => e.editor instanceof MergeEditorInput_1));
-                const inputModels = ( (editors.map(e => e.editor._inputModel))).filter(isDefined);
-                return await this._inputModel.confirmClose(inputModels);
-            },
-        };
-        this.mergeEditorModeFactory = this._instaService.createInstance(this.useWorkingCopy
-            ? TempFileMergeEditorModeFactory
-            : WorkspaceMergeEditorModeFactory, this._instaService.createInstance(MergeEditorTelemetry));
-    }
-    dispose() {
-        super.dispose();
-    }
-    get typeId() {
-        return MergeEditorInput_1.ID;
-    }
-    get editorId() {
-        return DEFAULT_EDITOR_ASSOCIATION.id;
-    }
-    get capabilities() {
-        let capabilities = super.capabilities | 256 ;
-        if (this.useWorkingCopy) {
-            capabilities |= 4 ;
-        }
-        return capabilities;
-    }
-    getName() {
-        return ( localize(7964, "Merging: {0}", super.getName()));
-    }
-    async resolve() {
-        if (!this._inputModel) {
-            const inputModel = this._register(await this.mergeEditorModeFactory.createInputModel({
-                base: this.base,
-                input1: this.input1,
-                input2: this.input2,
-                result: this.result,
-            }));
-            this._inputModel = inputModel;
-            this._register(autorun(reader => {
-                inputModel.isDirty.read(reader);
-                this._onDidChangeDirty.fire();
-            }));
-            await this._inputModel.model.onInitialized;
-        }
-        return this._inputModel;
-    }
-    async accept() {
-        await this._inputModel?.accept();
-    }
-    async save(group, options) {
-        await this._inputModel?.save(options);
-        return undefined;
-    }
-    toUntyped() {
-        return {
-            input1: { resource: this.input1.uri, label: this.input1.title, description: this.input1.description, detail: this.input1.detail },
-            input2: { resource: this.input2.uri, label: this.input2.title, description: this.input2.description, detail: this.input2.detail },
-            base: { resource: this.base },
-            result: { resource: this.result },
-            options: {
-                override: this.typeId
-            }
-        };
-    }
-    matches(otherInput) {
-        if (this === otherInput) {
-            return true;
-        }
-        if (otherInput instanceof MergeEditorInput_1) {
-            return isEqual(this.base, otherInput.base)
-                && isEqual(this.input1.uri, otherInput.input1.uri)
-                && isEqual(this.input2.uri, otherInput.input2.uri)
-                && isEqual(this.result, otherInput.result);
-        }
-        if (isResourceMergeEditorInput(otherInput)) {
-            return (this.editorId === otherInput.options?.override || otherInput.options?.override === undefined)
-                && isEqual(this.base, otherInput.base.resource)
-                && isEqual(this.input1.uri, otherInput.input1.resource)
-                && isEqual(this.input2.uri, otherInput.input2.resource)
-                && isEqual(this.result, otherInput.result.resource);
-        }
-        return false;
-    }
-    async revert(group, options) {
-        return this._inputModel?.revert(options);
-    }
-    isDirty() {
-        return this._inputModel?.isDirty.get() ?? false;
-    }
-    setLanguageId(languageId, source) {
-        this._inputModel?.model.setLanguageId(languageId, source);
-    }
-};
-MergeEditorInput = MergeEditorInput_1 = ( (__decorate([
-    ( (__param(4, IInstantiationService))),
-    ( (__param(5, IEditorService))),
-    ( (__param(6, ITextFileService))),
-    ( (__param(7, ILabelService))),
-    ( (__param(8, IFileService))),
-    ( (__param(9, IConfigurationService))),
-    ( (__param(10, IFilesConfigurationService))),
-    ( (__param(11, ITextResourceConfigurationService))),
-    ( (__param(12, ICustomEditorLabelService)))
-], MergeEditorInput)));
-
-export { MergeEditorInput, MergeEditorInputData };

package/vscode/src/vs/workbench/contrib/mergeEditor/browser/mergeEditorInputModel.js

@@ -1,399 +0,0 @@
-import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
-import { assertFn } from '../../../../base/common/assert.js';
-import { BugIndicatingError } from '../../../../base/common/errors.js';
-import { Event } from '../../../../base/common/event.js';
-import { DisposableStore } from '../../../../base/common/lifecycle.js';
-import { observableValue } from '../../../../base/common/observableInternal/base.js';
-import '../../../../base/common/arrays.js';
-import '../../../../base/common/observableInternal/autorun.js';
-import { derived } from '../../../../base/common/observableInternal/derived.js';
-import '../../../../base/common/cancellation.js';
-import { observableFromEvent } from '../../../../base/common/observableInternal/utils.js';
-import { basename, isEqual } from '../../../../base/common/resources.js';
-import Severity$1 from '../../../../base/common/severity.js';
-import { IModelService } from '../../../../editor/common/services/model.js';
-import { ITextModelService } from '../../../../editor/common/services/resolverService.js';
-import { localize } from '../../../../nls.js';
-import { IDialogService } from '../../../../platform/dialogs/common/dialogs.service.js';
-import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
-import { IStorageService } from '../../../../platform/storage/common/storage.service.js';
-import { SaveSourceRegistry } from '../../../common/editor.js';
-import { EditorModel } from '../../../common/editor/editorModel.js';
-import { conflictMarkers } from './mergeMarkers/mergeMarkersController.js';
-import { MergeDiffComputer } from './model/diffComputer.js';
-import { MergeEditorModel } from './model/mergeEditorModel.js';
-import { StorageCloseWithConflicts } from '../common/mergeEditor.js';
-import { IEditorService } from '../../../services/editor/common/editorService.service.js';
-import { ITextFileService } from '../../../services/textfile/common/textfiles.service.js';
-
-var WorkspaceMergeEditorModeFactory_1;
-let TempFileMergeEditorModeFactory = class TempFileMergeEditorModeFactory {
-    constructor(_mergeEditorTelemetry, _instantiationService, _textModelService, _modelService) {
-        this._mergeEditorTelemetry = _mergeEditorTelemetry;
-        this._instantiationService = _instantiationService;
-        this._textModelService = _textModelService;
-        this._modelService = _modelService;
-    }
-    async createInputModel(args) {
-        const store = ( (new DisposableStore()));
-        const [base, result, input1Data, input2Data,] = await Promise.all([
-            this._textModelService.createModelReference(args.base),
-            this._textModelService.createModelReference(args.result),
-            toInputData(args.input1, this._textModelService, store),
-            toInputData(args.input2, this._textModelService, store),
-        ]);
-        store.add(base);
-        store.add(result);
-        const tempResultUri = result.object.textEditorModel.uri.with({ scheme: 'merge-result' });
-        const temporaryResultModel = this._modelService.createModel('', {
-            languageId: result.object.textEditorModel.getLanguageId(),
-            onDidChange: Event.None,
-        }, tempResultUri);
-        store.add(temporaryResultModel);
-        const mergeDiffComputer = this._instantiationService.createInstance(MergeDiffComputer);
-        const model = this._instantiationService.createInstance(MergeEditorModel, base.object.textEditorModel, input1Data, input2Data, temporaryResultModel, mergeDiffComputer, {
-            resetResult: true,
-        }, this._mergeEditorTelemetry);
-        store.add(model);
-        await model.onInitialized;
-        return this._instantiationService.createInstance(TempFileMergeEditorInputModel, model, store, result.object, args.result);
-    }
-};
-TempFileMergeEditorModeFactory = ( (__decorate([
-    ( (__param(1, IInstantiationService))),
-    ( (__param(2, ITextModelService))),
-    ( (__param(3, IModelService)))
-], TempFileMergeEditorModeFactory)));
-let TempFileMergeEditorInputModel = class TempFileMergeEditorInputModel extends EditorModel {
-    constructor(model, disposable, result, resultUri, textFileService, dialogService, editorService) {
-        super();
-        this.model = model;
-        this.disposable = disposable;
-        this.result = result;
-        this.resultUri = resultUri;
-        this.textFileService = textFileService;
-        this.dialogService = dialogService;
-        this.editorService = editorService;
-        this.savedAltVersionId = observableValue(this, this.model.resultTextModel.getAlternativeVersionId());
-        this.altVersionId = observableFromEvent(this, e => this.model.resultTextModel.onDidChangeContent(e), () =>
-         this.model.resultTextModel.getAlternativeVersionId());
-        this.isDirty = derived(this, (reader) => this.altVersionId.read(reader) !== this.savedAltVersionId.read(reader));
-        this.finished = false;
-    }
-    dispose() {
-        this.disposable.dispose();
-        super.dispose();
-    }
-    async accept() {
-        const value = await this.model.resultTextModel.getValue();
-        this.result.textEditorModel.setValue(value);
-        this.savedAltVersionId.set(this.model.resultTextModel.getAlternativeVersionId(), undefined);
-        await this.textFileService.save(this.result.textEditorModel.uri);
-        this.finished = true;
-    }
-    async _discard() {
-        await this.textFileService.revert(this.model.resultTextModel.uri);
-        this.savedAltVersionId.set(this.model.resultTextModel.getAlternativeVersionId(), undefined);
-        this.finished = true;
-    }
-    shouldConfirmClose() {
-        return true;
-    }
-    async confirmClose(inputModels) {
-        assertFn(() => ( (inputModels.some((m) => m === this))));
-        const someDirty = ( (inputModels.some((m) => m.isDirty.get())));
-        let choice;
-        if (someDirty) {
-            const isMany = inputModels.length > 1;
-            const message = isMany
-                ? ( localize(
-                10894,
-                'Do you want keep the merge result of {0} files?',
-                inputModels.length
-            ))
-                : ( localize(
-                10895,
-                'Do you want keep the merge result of {0}?',
-                basename(inputModels[0].model.resultTextModel.uri)
-            ));
-            const hasUnhandledConflicts = ( (inputModels.some((m) => m.model.hasUnhandledConflicts.get())));
-            const buttons = [
-                {
-                    label: hasUnhandledConflicts ?
-                        ( localize(10896, "&&Save With Conflicts")) :
-                        ( localize(10897, "&&Save")),
-                    run: () => 0
-                },
-                {
-                    label: ( localize(10898, "Do&&n't Save")),
-                    run: () => 1
-                }
-            ];
-            choice = (await this.dialogService.prompt({
-                type: Severity$1.Info,
-                message,
-                detail: hasUnhandledConflicts
-                    ? isMany
-                        ? ( localize(
-                    10899,
-                    "The files contain unhandled conflicts. The merge results will be lost if you don't save them."
-                ))
-                        : ( localize(
-                    10900,
-                    "The file contains unhandled conflicts. The merge result will be lost if you don't save it."
-                ))
-                    : isMany
-                        ? ( localize(10901, "The merge results will be lost if you don't save them."))
-                        : ( localize(10902, "The merge result will be lost if you don't save it.")),
-                buttons,
-                cancelButton: {
-                    run: () => 2
-                }
-            })).result;
-        }
-        else {
-            choice = 1 ;
-        }
-        if (choice === 0 ) {
-            await Promise.all(( (inputModels.map(m => m.accept()))));
-        }
-        else if (choice === 1 ) {
-            await Promise.all(( (inputModels.map(m => m._discard()))));
-        }
-        else ;
-        return choice;
-    }
-    async save(options) {
-        if (this.finished) {
-            return;
-        }
-        (async () => {
-            const { confirmed } = await this.dialogService.confirm({
-                message: ( localize(10903, "Do you want to accept the merge result?")),
-                detail: ( localize(
-                    10904,
-                    "This will write the merge result to the original file and close the merge editor."
-                )),
-                primaryButton: ( localize(10905, '&&Accept Merge'))
-            });
-            if (confirmed) {
-                await this.accept();
-                const editors = this.editorService.findEditors(this.resultUri).filter(e => e.editor.typeId === 'mergeEditor.Input');
-                await this.editorService.closeEditors(editors);
-            }
-        })();
-    }
-    async revert(options) {
-    }
-};
-TempFileMergeEditorInputModel = ( (__decorate([
-    ( (__param(4, ITextFileService))),
-    ( (__param(5, IDialogService))),
-    ( (__param(6, IEditorService)))
-], TempFileMergeEditorInputModel)));
-let WorkspaceMergeEditorModeFactory = class WorkspaceMergeEditorModeFactory {
-    static { WorkspaceMergeEditorModeFactory_1 = this; }
-    constructor(_mergeEditorTelemetry, _instantiationService, _textModelService, textFileService) {
-        this._mergeEditorTelemetry = _mergeEditorTelemetry;
-        this._instantiationService = _instantiationService;
-        this._textModelService = _textModelService;
-        this.textFileService = textFileService;
-    }
-    static { this.FILE_SAVED_SOURCE = SaveSourceRegistry.registerSource('merge-editor.source', ( localize(10906, "Before Resolving Conflicts In Merge Editor"))); }
-    async createInputModel(args) {
-        const store = ( (new DisposableStore()));
-        let resultTextFileModel = undefined;
-        const modelListener = store.add(( (new DisposableStore())));
-        const handleDidCreate = (model) => {
-            if (isEqual(args.result, model.resource)) {
-                modelListener.clear();
-                resultTextFileModel = model;
-            }
-        };
-        modelListener.add(this.textFileService.files.onDidCreate(handleDidCreate));
-        this.textFileService.files.models.forEach(handleDidCreate);
-        const [base, result, input1Data, input2Data,] = await Promise.all([
-            this._textModelService.createModelReference(args.base),
-            this._textModelService.createModelReference(args.result),
-            toInputData(args.input1, this._textModelService, store),
-            toInputData(args.input2, this._textModelService, store),
-        ]);
-        store.add(base);
-        store.add(result);
-        if (!resultTextFileModel) {
-            throw ( (new BugIndicatingError()));
-        }
-        await resultTextFileModel.save({ source: WorkspaceMergeEditorModeFactory_1.FILE_SAVED_SOURCE });
-        const lines = resultTextFileModel.textEditorModel.getLinesContent();
-        const hasConflictMarkers = ( (lines.some(l => l.startsWith(conflictMarkers.start))));
-        const resetResult = hasConflictMarkers;
-        const mergeDiffComputer = this._instantiationService.createInstance(MergeDiffComputer);
-        const model = this._instantiationService.createInstance(MergeEditorModel, base.object.textEditorModel, input1Data, input2Data, result.object.textEditorModel, mergeDiffComputer, {
-            resetResult
-        }, this._mergeEditorTelemetry);
-        store.add(model);
-        await model.onInitialized;
-        return this._instantiationService.createInstance(WorkspaceMergeEditorInputModel, model, store, resultTextFileModel, this._mergeEditorTelemetry);
-    }
-};
-WorkspaceMergeEditorModeFactory = WorkspaceMergeEditorModeFactory_1 = ( (__decorate([
-    ( (__param(1, IInstantiationService))),
-    ( (__param(2, ITextModelService))),
-    ( (__param(3, ITextFileService)))
-], WorkspaceMergeEditorModeFactory)));
-let WorkspaceMergeEditorInputModel = class WorkspaceMergeEditorInputModel extends EditorModel {
-    constructor(model, disposableStore, resultTextFileModel, telemetry, _dialogService, _storageService) {
-        super();
-        this.model = model;
-        this.disposableStore = disposableStore;
-        this.resultTextFileModel = resultTextFileModel;
-        this.telemetry = telemetry;
-        this._dialogService = _dialogService;
-        this._storageService = _storageService;
-        this.isDirty = observableFromEvent(this, Event.any(this.resultTextFileModel.onDidChangeDirty, this.resultTextFileModel.onDidSaveError), () =>  this.resultTextFileModel.isDirty());
-        this.reported = false;
-        this.dateTimeOpened = ( (new Date()));
-    }
-    dispose() {
-        this.disposableStore.dispose();
-        super.dispose();
-        this.reportClose(false);
-    }
-    reportClose(accepted) {
-        if (!this.reported) {
-            const remainingConflictCount = this.model.unhandledConflictsCount.get();
-            const durationOpenedMs = ( (new Date())).getTime() - this.dateTimeOpened.getTime();
-            this.telemetry.reportMergeEditorClosed({
-                durationOpenedSecs: durationOpenedMs / 1000,
-                remainingConflictCount,
-                accepted,
-                conflictCount: this.model.conflictCount,
-                combinableConflictCount: this.model.combinableConflictCount,
-                conflictsResolvedWithBase: this.model.conflictsResolvedWithBase,
-                conflictsResolvedWithInput1: this.model.conflictsResolvedWithInput1,
-                conflictsResolvedWithInput2: this.model.conflictsResolvedWithInput2,
-                conflictsResolvedWithSmartCombination: this.model.conflictsResolvedWithSmartCombination,
-                manuallySolvedConflictCountThatEqualNone: this.model.manuallySolvedConflictCountThatEqualNone,
-                manuallySolvedConflictCountThatEqualSmartCombine: this.model.manuallySolvedConflictCountThatEqualSmartCombine,
-                manuallySolvedConflictCountThatEqualInput1: this.model.manuallySolvedConflictCountThatEqualInput1,
-                manuallySolvedConflictCountThatEqualInput2: this.model.manuallySolvedConflictCountThatEqualInput2,
-                manuallySolvedConflictCountThatEqualNoneAndStartedWithBase: this.model.manuallySolvedConflictCountThatEqualNoneAndStartedWithBase,
-                manuallySolvedConflictCountThatEqualNoneAndStartedWithInput1: this.model.manuallySolvedConflictCountThatEqualNoneAndStartedWithInput1,
-                manuallySolvedConflictCountThatEqualNoneAndStartedWithInput2: this.model.manuallySolvedConflictCountThatEqualNoneAndStartedWithInput2,
-                manuallySolvedConflictCountThatEqualNoneAndStartedWithBothNonSmart: this.model.manuallySolvedConflictCountThatEqualNoneAndStartedWithBothNonSmart,
-                manuallySolvedConflictCountThatEqualNoneAndStartedWithBothSmart: this.model.manuallySolvedConflictCountThatEqualNoneAndStartedWithBothSmart,
-            });
-            this.reported = true;
-        }
-    }
-    async accept() {
-        this.reportClose(true);
-        await this.resultTextFileModel.save();
-    }
-    get resultUri() {
-        return this.resultTextFileModel.resource;
-    }
-    async save(options) {
-        await this.resultTextFileModel.save(options);
-    }
-    async revert(options) {
-        await this.resultTextFileModel.revert(options);
-    }
-    shouldConfirmClose() {
-        return true;
-    }
-    async confirmClose(inputModels) {
-        const isMany = inputModels.length > 1;
-        const someDirty = ( (inputModels.some(m => m.isDirty.get())));
-        const someUnhandledConflicts = ( (inputModels.some(m => m.model.hasUnhandledConflicts.get())));
-        if (someDirty) {
-            const message = isMany
-                ? ( localize(
-                10907,
-                'Do you want to save the changes you made to {0} files?',
-                inputModels.length
-            ))
-                : ( localize(
-                10908,
-                'Do you want to save the changes you made to {0}?',
-                basename(inputModels[0].resultUri)
-            ));
-            const { result } = await this._dialogService.prompt({
-                type: Severity$1.Info,
-                message,
-                detail: someUnhandledConflicts ?
-                    isMany
-                        ? ( localize(
-                        10909,
-                        "The files contain unhandled conflicts. Your changes will be lost if you don't save them."
-                    ))
-                        : ( localize(
-                        10910,
-                        "The file contains unhandled conflicts. Your changes will be lost if you don't save them."
-                    ))
-                    : isMany
-                        ? ( localize(10911, "Your changes will be lost if you don't save them."))
-                        : ( localize(10912, "Your changes will be lost if you don't save them.")),
-                buttons: [
-                    {
-                        label: someUnhandledConflicts
-                            ? ( localize(10913, '&&Save with Conflicts'))
-                            : ( localize(10914, '&&Save')),
-                        run: () => 0
-                    },
-                    {
-                        label: ( localize(10915, "Do&&n't Save")),
-                        run: () => 1
-                    }
-                ],
-                cancelButton: {
-                    run: () => 2
-                }
-            });
-            return result;
-        }
-        else if (someUnhandledConflicts && !this._storageService.getBoolean(StorageCloseWithConflicts, 0 , false)) {
-            const { confirmed, checkboxChecked } = await this._dialogService.confirm({
-                message: isMany
-                    ? ( localize(10916, 'Do you want to close {0} merge editors?', inputModels.length))
-                    : ( localize(
-                    10917,
-                    'Do you want to close the merge editor for {0}?',
-                    basename(inputModels[0].resultUri)
-                )),
-                detail: someUnhandledConflicts ?
-                    isMany
-                        ? ( localize(10918, "The files contain unhandled conflicts."))
-                        : ( localize(10919, "The file contains unhandled conflicts."))
-                    : undefined,
-                primaryButton: someUnhandledConflicts
-                    ? ( localize(10920, '&&Close with Conflicts'))
-                    : ( localize(10921, '&&Close')),
-                checkbox: { label: ( localize(10922, "Do not ask me again")) }
-            });
-            if (checkboxChecked) {
-                this._storageService.store(StorageCloseWithConflicts, true, 0 , 0 );
-            }
-            return confirmed ? 0  : 2 ;
-        }
-        else {
-            return 0 ;
-        }
-    }
-};
-WorkspaceMergeEditorInputModel = ( (__decorate([
-    ( (__param(4, IDialogService))),
-    ( (__param(5, IStorageService)))
-], WorkspaceMergeEditorInputModel)));
-async function toInputData(data, textModelService, store) {
-    const ref = await textModelService.createModelReference(data.uri);
-    store.add(ref);
-    return {
-        textModel: ref.object.textEditorModel,
-        title: data.title,
-        description: data.description,
-        detail: data.detail,
-    };
-}
-
-export { TempFileMergeEditorModeFactory, WorkspaceMergeEditorModeFactory };

package/vscode/src/vs/workbench/contrib/mergeEditor/browser/mergeMarkers/mergeMarkersController.js

@@ -1,17 +0,0 @@
-import '../../../../../base/browser/dom.js';
-import '../../../../../base/common/lifecycle.js';
-import '../../../../../base/common/arrays.js';
-import '../../../../../base/common/event.js';
-import '../../../../../base/common/observableInternal/autorun.js';
-import '../../../../../base/common/observableInternal/derived.js';
-import '../../../../../base/common/cancellation.js';
-import '../../../../../base/common/observableInternal/utils.js';
-import '../model/lineRange.js';
-import '../../../../../nls.js';
-
-const conflictMarkers = {
-    start: '<<<<<<<',
-    end: '>>>>>>>',
-};
-
-export { conflictMarkers };