From ef499350c162102972eb74050a675311cd9e72da Mon Sep 17 00:00:00 2001 From: Christof Marti Date: Mon, 30 Jan 2017 13:30:22 -0800 Subject: [PATCH] Check if new SCM integration is enabled (fixes #18857 and #19337) --- .../editor/vs_code_editor_walkthrough.md | 2 +- .../walkThrough/electron-browser/walkThroughPart.css | 10 ++++++++++ .../walkThrough/electron-browser/walkThroughPart.ts | 10 ++++++++++ .../electron-browser/vs_code_welcome_page.html | 2 +- .../parts/welcomePage/electron-browser/welcomePage.css | 10 ++++++++++ 5 files changed, 32 insertions(+), 2 deletions(-) diff --git a/src/vs/workbench/parts/walkThrough/electron-browser/editor/vs_code_editor_walkthrough.md b/src/vs/workbench/parts/walkThrough/electron-browser/editor/vs_code_editor_walkthrough.md index c3f2283e892..317a5c8009f 100644 --- a/src/vs/workbench/parts/walkThrough/electron-browser/editor/vs_code_editor_walkthrough.md +++ b/src/vs/workbench/parts/walkThrough/electron-browser/editor/vs_code_editor_walkthrough.md @@ -157,7 +157,7 @@ ul>li.item$*5 ## Thanks! Well if you have got this far then you will have touched on some of the editing features in Visual Studio Code. But don't stop now :) We have lots of additional [documentation](https://code.visualstudio.com/docs) and [introductory videos](https://code.visualstudio.com/docs/introvideos/overview) for the product that will help you learn how to use it. And while you are here, here are a few additional things you can try: - Open the Integrated Terminal by pressing kb(workbench.action.terminal.toggleTerminal) then see what's possible by [reviewing the terminal documentation](https://code.visualstudio.com/docs/editor/integrated-terminal) -- Work with version control by pressing kb(workbench.view.git) understand how to stage, commit, change branches, and view diffs and more by reviewing the [version control documentation](https://code.visualstudio.com/docs/editor/versioncontrol) +- Work with version control by pressing kb(workbench.view.git)kb(workbench.view.scm) understand how to stage, commit, change branches, and view diffs and more by reviewing the [version control documentation](https://code.visualstudio.com/docs/editor/versioncontrol) - Browse thousands of extensions in our integrated gallery by pressing with kb(workbench.view.extensions) the [documentation](https://code.visualstudio.com/docs/editor/extension-gallery) will show you how to see the most popular extensions, disable installed ones and more. OK that's all for now, diff --git a/src/vs/workbench/parts/walkThrough/electron-browser/walkThroughPart.css b/src/vs/workbench/parts/walkThrough/electron-browser/walkThroughPart.css index ba51d1005eb..be87463c2d1 100644 --- a/src/vs/workbench/parts/walkThrough/electron-browser/walkThroughPart.css +++ b/src/vs/workbench/parts/walkThrough/electron-browser/walkThroughPart.css @@ -159,6 +159,16 @@ display: initial; } +.monaco-workbench > .part.editor > .content .walkThroughContent .scm-only { + display: none; +} +.monaco-workbench > .part.editor > .content .walkThroughContent.scmEnabled .scm-only { + display: initial; +} +.monaco-workbench > .part.editor > .content .walkThroughContent.scmEnabled .git-only { + display: none; +} + .vs .monaco-workbench > .part.editor > .content .walkThroughContent .monaco-editor-background, .vs .monaco-workbench > .part.editor > .content .walkThroughContent .glyph-margin { background-color: #eee; diff --git a/src/vs/workbench/parts/walkThrough/electron-browser/walkThroughPart.ts b/src/vs/workbench/parts/walkThrough/electron-browser/walkThroughPart.ts index 39d5039038c..b31984a2c53 100644 --- a/src/vs/workbench/parts/walkThrough/electron-browser/walkThroughPart.ts +++ b/src/vs/workbench/parts/walkThrough/electron-browser/walkThroughPart.ts @@ -34,6 +34,7 @@ import { Scope } from 'vs/workbench/common/memento'; import { RawContextKey, IContextKey, IContextKeyService } from 'vs/platform/contextkey/common/contextkey'; import { IConfigurationService } from 'vs/platform/configuration/common/configuration'; import { once } from 'vs/base/common/event'; +import SCMPreview from 'vs/workbench/parts/scm/browser/scmPreview'; export const WALK_THROUGH_FOCUS = new RawContextKey('interactivePlaygroundFocus', false); @@ -247,6 +248,7 @@ export class WalkThroughPart extends BaseEditor { if (strings.endsWith(input.getResource().path, '.html')) { this.content.innerHTML = content; this.updateSizeClasses(); + this.updateMarkerClasses(); this.decorateContent(); if (input.onReady) { input.onReady(this.content.firstElementChild as HTMLElement); @@ -324,6 +326,7 @@ export class WalkThroughPart extends BaseEditor { })); }); this.updateSizeClasses(); + this.updateMarkerClasses(); if (input.onReady) { input.onReady(innerContent); } @@ -332,6 +335,13 @@ export class WalkThroughPart extends BaseEditor { }); } + private updateMarkerClasses() { + const innerContent = this.content.firstElementChild; + if (SCMPreview.enabled && innerContent) { + innerContent.classList.add('scmEnabled'); + } + } + private style(div: HTMLElement) { const styleElement = document.querySelector('.monaco-editor-background'); const {color, backgroundColor, fontFamily, fontWeight, fontSize} = window.getComputedStyle(styleElement); diff --git a/src/vs/workbench/parts/welcomePage/electron-browser/vs_code_welcome_page.html b/src/vs/workbench/parts/welcomePage/electron-browser/vs_code_welcome_page.html index 26e9660f004..276ac91fd1b 100644 --- a/src/vs/workbench/parts/welcomePage/electron-browser/vs_code_welcome_page.html +++ b/src/vs/workbench/parts/welcomePage/electron-browser/vs_code_welcome_page.html @@ -11,7 +11,7 @@
diff --git a/src/vs/workbench/parts/welcomePage/electron-browser/welcomePage.css b/src/vs/workbench/parts/welcomePage/electron-browser/welcomePage.css index 225f3fbfcd8..9a43d53fde3 100644 --- a/src/vs/workbench/parts/welcomePage/electron-browser/welcomePage.css +++ b/src/vs/workbench/parts/welcomePage/electron-browser/welcomePage.css @@ -276,4 +276,14 @@ } .monaco-workbench.linux > .part.editor > .content .welcomePage .linux-only { display: initial; +} + +.monaco-workbench > .part.editor > .content .welcomePageContainer .scm-only { + display: none; +} +.monaco-workbench > .part.editor > .content .welcomePageContainer.scmEnabled .scm-only { + display: initial; +} +.monaco-workbench > .part.editor > .content .welcomePageContainer.scmEnabled .git-only { + display: none; } \ No newline at end of file -- GitLab