Skip to content

Commit e3877c0

Browse files
meganroggemeganrogge
committed
Merge branch 'main' into merogge/inline-chat-revamp
2 parents 10d18d9 + 87ee421 commit e3877c0

File tree

41 files changed

+270
-83
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+270
-83
lines changed

‎extensions/markdown-language-features/media/markdown.css

Lines changed: 35 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,11 @@ p, ol, ul, pre {
2121
margin-top: 0;
2222
}
2323

24-
h2, h3, h4, h5, h6 {
25-
font-weight: normal;
26-
margin-bottom: 0.2em;
24+
h1, h2, h3, h4, h5, h6 {
25+
font-weight: 600;
26+
margin-top: 24px;
27+
margin-bottom: 16px;
28+
line-height: 1.25;
2729
}
2830

2931
#code-csp-warning {
@@ -133,7 +135,7 @@ textarea:focus {
133135
}
134136

135137
p {
136-
margin-bottom: 0.7em;
138+
margin-bottom: 16px;
137139
}
138140

139141
ul,
@@ -143,16 +145,39 @@ ol {
143145

144146
hr {
145147
border: 0;
146-
height: 2px;
147-
border-bottom: 2px solid;
148+
height: 1px;
149+
border-bottom: 1px solid;
148150
}
149151

150152
h1 {
153+
font-size: 2em;
154+
margin-top: 0;
151155
padding-bottom: 0.3em;
152-
line-height: 1.2;
153156
border-bottom-width: 1px;
154157
border-bottom-style: solid;
155-
font-weight: normal;
158+
}
159+
160+
h2 {
161+
font-size: 1.5em;
162+
padding-bottom: 0.3em;
163+
border-bottom-width: 1px;
164+
border-bottom-style: solid;
165+
}
166+
167+
h3 {
168+
font-size: 1.25em;
169+
}
170+
171+
h4 {
172+
font-size: 1em;
173+
}
174+
175+
h5 {
176+
font-size: 0.875em;
177+
}
178+
179+
h6 {
180+
font-size: 0.85em;
156181
}
157182

158183
table {
@@ -222,12 +247,14 @@ pre {
222247
}
223248

224249
.vscode-light h1,
250+
.vscode-light h2,
225251
.vscode-light hr,
226252
.vscode-light td {
227253
border-color: rgba(0, 0, 0, 0.18);
228254
}
229255

230256
.vscode-dark h1,
257+
.vscode-dark h2,
231258
.vscode-dark hr,
232259
.vscode-dark td {
233260
border-color: rgba(255, 255, 255, 0.18);

‎extensions/markdown-language-features/src/preview/documentRenderer.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ export class MdDocumentRenderer {
103103
${this._getStyles(resourceProvider, sourceUri, config, imageInfo)}
104104
<base href="${resourceProvider.asWebviewUri(markdownDocument.uri)}">
105105
</head>
106-
<body class="vscode-body ${config.scrollBeyondLastLine ? 'scrollBeyondLastLine' : ''} ${config.wordWrap ? 'wordWrap' : ''} ${config.markEditorSelection ? 'showEditorSelection' : ''}">
106+
<body class="vscode-body style="overscroll-behavior-x: none;" ${config.scrollBeyondLastLine ? 'scrollBeyondLastLine' : ''} ${config.wordWrap ? 'wordWrap' : ''} ${config.markEditorSelection ? 'showEditorSelection' : ''}">
107107
${body.html}
108108
${this._getScripts(resourceProvider, nonce)}
109109
</body>

‎extensions/media-preview/media/videoPreview.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,9 @@
3333
}
3434
video.playsInline = true;
3535
video.controls = true;
36+
video.autoplay = settings.autoplay;
37+
video.muted = settings.autoplay;
38+
video.loop = settings.loop;
3639

3740
function onLoaded() {
3841
if (hasLoadedMedia) {

‎extensions/media-preview/package.json

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,22 @@
2727
}
2828
},
2929
"contributes": {
30+
"configuration": {
31+
"type": "object",
32+
"title": "Media Previewer",
33+
"properties": {
34+
"previewer.videos.autoPlay": {
35+
"type": "boolean",
36+
"default": false,
37+
"markdownDescription": "%videoPreviewerAutoPlay%"
38+
},
39+
"previewer.videos.loop": {
40+
"type": "boolean",
41+
"default": false,
42+
"markdownDescription": "%videoPreviewerLoop%"
43+
}
44+
}
45+
},
3046
"customEditors": [
3147
{
3248
"viewType": "imagePreview.previewEditor",

‎extensions/media-preview/package.nls.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44
"customEditor.audioPreview.displayName": "Audio Preview",
55
"customEditor.imagePreview.displayName": "Image Preview",
66
"customEditor.videoPreview.displayName": "Video Preview",
7+
"videoPreviewerAutoPlay": "Start playing videos on mute automatically.",
8+
"videoPreviewerLoop": "Loop videos over again automatically.",
79
"command.zoomIn": "Zoom in",
810
"command.zoomOut": "Zoom out",
911
"command.copyImage": "Copy"

‎extensions/media-preview/src/videoPreview.ts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,11 @@ class VideoPreview extends MediaPreview {
5454

5555
protected async getWebviewContents(): Promise<string> {
5656
const version = Date.now().toString();
57+
const configurations = vscode.workspace.getConfiguration('previewer.videos');
5758
const settings = {
5859
src: await this.getResourcePath(this.webviewEditor, this.resource, version),
60+
autoplay: configurations.get('autoPlay'),
61+
loop: configurations.get('loop'),
5962
};
6063

6164
const nonce = getNonce();

‎package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "code-oss-dev",
33
"version": "1.80.0",
4-
"distro": "af8371aefe39ad95c3ea2154264240585883bb0b",
4+
"distro": "0c13273c1deeafa0dea46e35c9df70622c281dc7",
55
"author": {
66
"name": "Microsoft Corporation"
77
},
@@ -211,7 +211,7 @@
211211
"ts-loader": "^9.4.2",
212212
"ts-node": "^10.9.1",
213213
"tsec": "0.1.4",
214-
"typescript": "^5.2.0-dev.20230602",
214+
"typescript": "^5.2.0-dev.20230621",
215215
"typescript-formatter": "7.1.0",
216216
"underscore": "^1.12.1",
217217
"util": "^0.12.4",

‎src/vs/editor/common/editorContextKeys.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ export namespace EditorContextKeys {
2424
*/
2525
export const textInputFocus = new RawContextKey<boolean>('textInputFocus', false, nls.localize('textInputFocus', "Whether an editor or a rich text input has focus (cursor is blinking)"));
2626

27-
export const readOnly = new RawContextKey<boolean>('editorReadonly', false, nls.localize('editorReadonly', "Whether the editor is read only"));
27+
export const readOnly = new RawContextKey<boolean>('editorReadonly', false, nls.localize('editorReadonly', "Whether the editor is read-only"));
2828
export const inDiffEditor = new RawContextKey<boolean>('inDiffEditor', false, nls.localize('inDiffEditor', "Whether the context is a diff editor"));
2929
export const isEmbeddedDiffEditor = new RawContextKey<boolean>('isEmbeddedDiffEditor', false, nls.localize('isEmbeddedDiffEditor', "Whether the context is an embedded diff editor"));
3030
export const columnSelection = new RawContextKey<boolean>('editorColumnSelection', false, nls.localize('editorColumnSelection', "Whether `editor.columnSelection` is enabled"));

‎src/vs/platform/files/common/fileService.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1380,15 +1380,15 @@ export class FileService extends Disposable implements IFileService {
13801380

13811381
protected throwIfFileSystemIsReadonly<T extends IFileSystemProvider>(provider: T, resource: URI): T {
13821382
if (provider.capabilities & FileSystemProviderCapabilities.Readonly) {
1383-
throw new FileOperationError(localize('err.readonly', "Unable to modify readonly file '{0}'", this.resourceForError(resource)), FileOperationResult.FILE_PERMISSION_DENIED);
1383+
throw new FileOperationError(localize('err.readonly', "Unable to modify read-only file '{0}'", this.resourceForError(resource)), FileOperationResult.FILE_PERMISSION_DENIED);
13841384
}
13851385

13861386
return provider;
13871387
}
13881388

13891389
private throwIfFileIsReadonly(resource: URI, stat: IStat): void {
13901390
if ((stat.permissions ?? 0) & FilePermission.Readonly) {
1391-
throw new FileOperationError(localize('err.readonly', "Unable to modify readonly file '{0}'", this.resourceForError(resource)), FileOperationResult.FILE_PERMISSION_DENIED);
1391+
throw new FileOperationError(localize('err.readonly', "Unable to modify read-only file '{0}'", this.resourceForError(resource)), FileOperationResult.FILE_PERMISSION_DENIED);
13921392
}
13931393
}
13941394

‎src/vs/platform/remoteTunnel/node/remoteTunnelService.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -340,13 +340,13 @@ export class RemoteTunnelService extends Disposable implements IRemoteTunnelServ
340340
}
341341
});
342342
if (!this.environmentService.isBuilt) {
343-
onOutput('Building tunnel CLI from sources and run', false);
344-
onOutput(`${logLabel} Spawning: cargo run -- tunnel ${commandArgs.join(' ')}`, false);
343+
onOutput('Building tunnel CLI from sources and run\n', false);
344+
onOutput(`${logLabel} Spawning: cargo run -- tunnel ${commandArgs.join(' ')}\n`, false);
345345
tunnelProcess = spawn('cargo', ['run', '--', 'tunnel', ...commandArgs], { cwd: join(this.environmentService.appRoot, 'cli'), stdio });
346346
} else {
347-
onOutput('Running tunnel CLI', false);
347+
onOutput('Running tunnel CLI\n', false);
348348
const tunnelCommand = this.getTunnelCommandLocation();
349-
onOutput(`${logLabel} Spawning: ${tunnelCommand} tunnel ${commandArgs.join(' ')}`, false);
349+
onOutput(`${logLabel} Spawning: ${tunnelCommand} tunnel ${commandArgs.join(' ')}\n`, false);
350350
tunnelProcess = spawn(tunnelCommand, ['tunnel', ...commandArgs], { cwd: homedir(), stdio });
351351
}
352352

0 commit comments

Comments
 (0)