GitHub/code-server
1
0
Fork 0
mirror of https://github.com/coder/code-server.git synced 2026-05-28 16:09:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat: apply patch after setting up subtree

Browse Source
This commit is contained in:
Joe Previte
2020-12-15 15:53:52 -07:00
parent 41bee49d07
commit 51a2a2ad2d
84 changed files with 3360 additions and 191 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
lib/vscode/src/vs/workbench/contrib/remote/browser/remote.ts
View File

@@ -778,17 +778,30 @@ class RemoteAgentConnectionStatusListener implements IWorkbenchContribution {
}
switch (e.type) {
case PersistentConnectionEventType.ConnectionLost:
break;
case PersistentConnectionEventType.ReconnectionWait:
const BACKGROUND_RECONNECT_THRESHOLD = 2;
// If the first reconnect fails, we show the popup.
// This corresponds to about 5s wait.
if (e.connectionAttempt < BACKGROUND_RECONNECT_THRESHOLD) {
break;
}
if (!visibleProgress) {
visibleProgress = showProgress(ProgressLocation.Dialog, [reconnectButton, reloadButton]);
}
visibleProgress.report(nls.localize('connectionLost', "Connection Lost"));
break;
case PersistentConnectionEventType.ReconnectionWait:
reconnectWaitEvent = e;
visibleProgress = showProgress(lastLocation || ProgressLocation.Notification, [reconnectButton, reloadButton]);
visibleProgress.startTimer(Date.now() + 1000 * e.durationSeconds);
break;
case PersistentConnectionEventType.ReconnectionRunning:
if (!visibleProgress) {
// Our background reconnection threshold hasn't been hit yet.
break;
}
visibleProgress = showProgress(lastLocation || ProgressLocation.Notification, [reloadButton]);
visibleProgress.report(nls.localize('reconnectionRunning', "Attempting to reconnect..."));

8
lib/vscode/src/vs/workbench/contrib/scm/browser/media/scm.css
View File

@@ -149,9 +149,11 @@
margin-right: 8px;
}
.scm-view .monaco-list .monaco-list-row .resource > .name > .monaco-icon-label > .actions {
flex-grow: 100;
}
/* NOTE@coder: Causes the label to shrink to zero width in Firefox due to
* overflow:hidden. This isn't right anyway, as far as I can tell. */
/* .scm-view .monaco-list .monaco-list-row .resource > .name > .monaco-icon-label > .actions { */
/* flex-grow: 100; */
/* } */
.scm-view .monaco-list .monaco-list-row .resource-group > .actions,
.scm-view .monaco-list .monaco-list-row .resource > .name > .monaco-icon-label > .actions {

16
lib/vscode/src/vs/workbench/contrib/welcome/page/browser/vs_code_welcome_page.ts
View File

@@ -4,6 +4,7 @@
*--------------------------------------------------------------------------------------------*/
import { escape } from 'vs/base/common/strings';
import product from 'vs/platform/product/common/product';
import { localize } from 'vs/nls';
export default () => `
@@ -11,7 +12,7 @@ export default () => `
<div class="welcomePage" role="document">
<div class="title">
<h1 class="caption">${escape(localize('welcomePage.vscode', "Visual Studio Code"))}</h1>
<p class="subtitle detail">${escape(localize({ key: 'welcomePage.editingEvolved', comment: ['Shown as subtitle on the Welcome page.'] }, "Editing evolved"))}</p>
<p class="subtitle detail">VS Code v${product.version}</p>
</div>
<div class="row">
<div class="splash">
@@ -32,6 +33,19 @@ export default () => `
</ul>
<p class="none detail">${escape(localize('welcomePage.noRecentFolders', "No recent folders"))}</p>
</div>
<div class="section help">
<h2 class="caption">code-server ${escape(localize('welcomePage.help', "Help"))}</h2>
<ul>
<li><a href="https://github.com/cdr/code-server">GitHub Repository</a></li>
<li><a href="https://github.com/cdr/code-server/releases/tag/v${product.codeServerVersion}">Release Notes</a></li>
<li><a href="https://github.com/cdr/code-server/issues">Issue Tracker</a></li>
<li><a href="https://github.com/cdr/code-server/blob/master/doc/FAQ.md">FAQ</a></li>
<li><a href="https://github.com/cdr/code-server/blob/master/doc/guide.md">Setup Guide</a></li>
<li><a href="https://github.com/cdr/code-server/tree/master/doc">Docs</a></li>
<li><a href="https://github.com/cdr/code-server/discussions">Discussions</a></li>
<li><a href="https://cdr.co/join-community">Slack</a></li>
</ul>
</div>
<div class="section help">
<h2 class="caption">${escape(localize('welcomePage.help', "Help"))}</h2>
<ul>

2
lib/vscode/src/vs/workbench/contrib/welcome/page/browser/welcomePage.css
View File

@@ -94,7 +94,7 @@
}
.monaco-workbench .part.editor > .content .welcomePage .splash .section {
margin-bottom: 5em;
margin-bottom: 3em;
}
.monaco-workbench .part.editor > .content .welcomePage .splash ul {

2
lib/vscode/src/vs/workbench/contrib/welcome/page/browser/welcomePage.ts
View File

@@ -328,7 +328,7 @@ class WelcomePage extends Disposable {
const prodName = container.querySelector('.welcomePage .title .caption') as HTMLElement;
if (prodName) {
prodName.textContent = this.productService.nameLong;
prodName.textContent = `code-server v${this.productService.codeServerVersion}`;
}
recentlyOpened.then(({ workspaces }) => {