From 84398489640d50d4805be2ac4f3207c09cdf7e37 Mon Sep 17 00:00:00 2001 From: isidor Date: Tue, 14 Nov 2017 18:45:21 +0100 Subject: [PATCH 1/6] more compossed twitter icon fixes #9064 --- .../electron-browser/media/feedback.css | 1 + .../electron-browser/media/twitter.svg | 550 +----------------- 2 files changed, 2 insertions(+), 549 deletions(-) mode change 100644 => 100755 src/vs/workbench/parts/feedback/electron-browser/media/twitter.svg diff --git a/src/vs/workbench/parts/feedback/electron-browser/media/feedback.css b/src/vs/workbench/parts/feedback/electron-browser/media/feedback.css index ae5f2d5236a..7d9c9d98e4b 100644 --- a/src/vs/workbench/parts/feedback/electron-browser/media/feedback.css +++ b/src/vs/workbench/parts/feedback/electron-browser/media/feedback.css @@ -163,6 +163,7 @@ background-image: url('twitter.svg'); background-color: #007ACC; background-position: left; + background-size: 20px; background-repeat: no-repeat; padding-left: 30px; padding-right: 12px; diff --git a/src/vs/workbench/parts/feedback/electron-browser/media/twitter.svg b/src/vs/workbench/parts/feedback/electron-browser/media/twitter.svg old mode 100644 new mode 100755 index 086f90550ff..f84018e01cf --- a/src/vs/workbench/parts/feedback/electron-browser/media/twitter.svg +++ b/src/vs/workbench/parts/feedback/electron-browser/media/twitter.svg @@ -1,549 +1 @@ - - - - - - +BrandTwitter_white_16x \ No newline at end of file From e2cb0ac35ed338653f47fe092fa35a41f0817795 Mon Sep 17 00:00:00 2001 From: Matt Bierner Date: Tue, 14 Nov 2017 10:32:31 -0800 Subject: [PATCH 2/6] Fix jsDoc setting resource warning --- extensions/typescript/src/features/jsDocCompletionProvider.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extensions/typescript/src/features/jsDocCompletionProvider.ts b/extensions/typescript/src/features/jsDocCompletionProvider.ts index 267acadb93f..0821822b6a6 100644 --- a/extensions/typescript/src/features/jsDocCompletionProvider.ts +++ b/extensions/typescript/src/features/jsDocCompletionProvider.ts @@ -70,7 +70,7 @@ export default class JsDocCompletionProvider implements CompletionItemProvider { const line = document.lineAt(position.line).text; const prefix = line.slice(0, position.character); if (prefix.match(/^\s*$|\/\*\*\s*$|^\s*\/\*\*+\s*$/)) { - const enableJsDocCompletions = workspace.getConfiguration(configurationNamespace).get(Configuration.enabled, true); + const enableJsDocCompletions = workspace.getConfiguration(configurationNamespace, document.uri).get(Configuration.enabled, true); return [new JsDocCompletionItem(document, position, enableJsDocCompletions)]; } return []; From fe48d23086ed6ea15bb7c149a832cf3a2a730720 Mon Sep 17 00:00:00 2001 From: Matt Bierner Date: Tue, 14 Nov 2017 11:27:05 -0800 Subject: [PATCH 3/6] Revert "Fixes markdown link syntax highlighting bug (#38328)" This reverts commit 5fd40618067f0dc15c7949c5bd90e77f3a4d5511. --- extensions/markdown/syntaxes/markdown.tmLanguage | 2 ++ extensions/markdown/syntaxes/markdown.tmLanguage.base | 2 ++ 2 files changed, 4 insertions(+) diff --git a/extensions/markdown/syntaxes/markdown.tmLanguage b/extensions/markdown/syntaxes/markdown.tmLanguage index 1b6d8f43963..5e7d26dea2b 100644 --- a/extensions/markdown/syntaxes/markdown.tmLanguage +++ b/extensions/markdown/syntaxes/markdown.tmLanguage @@ -3266,6 +3266,7 @@ (?x: (\!\[)((?<square>[^\[\]\\]|\\.|\[\g<square>*+\])*+)(\]) # Match the link text. + ([ ])? # Space not allowed (\() # Opening paren for url (<?)(\S+?)(>?) # The url [ \t]* # Optional whitespace @@ -3577,6 +3578,7 @@ (?x: (\[)((?<square>[^\[\]\\]|\\.|\[\g<square>*+\])*+)(\]) # Match the link text. + ([ ])? # Space not allowed (\() # Opening paren for url (<?)(.*?)(>?) # The url [ \t]* # Optional whitespace diff --git a/extensions/markdown/syntaxes/markdown.tmLanguage.base b/extensions/markdown/syntaxes/markdown.tmLanguage.base index 7660def31b7..d501f50a86f 100644 --- a/extensions/markdown/syntaxes/markdown.tmLanguage.base +++ b/extensions/markdown/syntaxes/markdown.tmLanguage.base @@ -756,6 +756,7 @@ (?x: (\!\[)((?<square>[^\[\]\\]|\\.|\[\g<square>*+\])*+)(\]) # Match the link text. + ([ ])? # Space not allowed (\() # Opening paren for url (<?)(\S+?)(>?) # The url [ \t]* # Optional whitespace @@ -1067,6 +1068,7 @@ (?x: (\[)((?<square>[^\[\]\\]|\\.|\[\g<square>*+\])*+)(\]) # Match the link text. + ([ ])? # Space not allowed (\() # Opening paren for url (<?)(.*?)(>?) # The url [ \t]* # Optional whitespace From fcd31ce6988554c6c4840fdca5e3e4ea55674451 Mon Sep 17 00:00:00 2001 From: isidor Date: Tue, 14 Nov 2017 20:47:30 +0100 Subject: [PATCH 4/6] fix build error --- src/vs/workbench/electron-browser/window.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/vs/workbench/electron-browser/window.ts b/src/vs/workbench/electron-browser/window.ts index 88ecca580d9..f7ca48b2098 100644 --- a/src/vs/workbench/electron-browser/window.ts +++ b/src/vs/workbench/electron-browser/window.ts @@ -43,7 +43,7 @@ import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey'; import { fillInActions } from 'vs/platform/actions/browser/menuItemActionItem'; import { RunOnceScheduler } from 'vs/base/common/async'; import { IDisposable, dispose } from 'vs/base/common/lifecycle'; -import { ConfigurationTarget, IConfigurationChangeEvent } from 'vs/platform/configuration/common/configuration'; +import { ConfigurationTarget } from 'vs/platform/configuration/common/configuration'; import { LifecyclePhase, ILifecycleService } from 'vs/platform/lifecycle/common/lifecycle'; import { IWorkspaceFolderCreationData } from 'vs/platform/workspaces/common/workspaces'; From 89f8a77cb8687b3b88b7ac6503bc6d13b3aeed04 Mon Sep 17 00:00:00 2001 From: Matt Bierner Date: Tue, 14 Nov 2017 11:49:17 -0800 Subject: [PATCH 5/6] Reapply #38328 with fix Fixes #38049 --- .../markdown/syntaxes/markdown.tmLanguage | 60 ++++++++----------- .../syntaxes/markdown.tmLanguage.base | 60 ++++++++----------- 2 files changed, 48 insertions(+), 72 deletions(-) diff --git a/extensions/markdown/syntaxes/markdown.tmLanguage b/extensions/markdown/syntaxes/markdown.tmLanguage index 5e7d26dea2b..a39b9d80b1e 100644 --- a/extensions/markdown/syntaxes/markdown.tmLanguage +++ b/extensions/markdown/syntaxes/markdown.tmLanguage @@ -3191,11 +3191,16 @@ name punctuation.definition.string.begin.markdown - 10 + 9 name string.other.link.description.title.markdown + 10 + + name + punctuation.definition.string.markdown + 11 name @@ -3204,12 +3209,12 @@ 12 name - punctuation.definition.string.markdown + string.other.link.description.title.markdown 13 name - string.other.link.description.title.markdown + punctuation.definition.string.markdown 14 @@ -3217,11 +3222,6 @@ punctuation.definition.string.markdown 15 - - name - punctuation.definition.string.markdown - - 16 name punctuation.definition.metadata.markdown @@ -3239,24 +3239,19 @@ 5 name - invalid.illegal.whitespace.markdown + punctuation.definition.metadata.markdown 6 name - punctuation.definition.metadata.markdown + punctuation.definition.link.markdown 7 - - name - punctuation.definition.link.markdown - - 8 name markup.underline.link.image.markdown - 9 + 8 name punctuation.definition.link.markdown @@ -3266,7 +3261,6 @@ (?x: (\!\[)((?<square>[^\[\]\\]|\\.|\[\g<square>*+\])*+)(\]) # Match the link text. - ([ ])? # Space not allowed (\() # Opening paren for url (<?)(\S+?)(>?) # The url [ \t]* # Optional whitespace @@ -3503,37 +3497,37 @@ name punctuation.definition.string.begin.markdown - 10 + 9 name string.other.link.description.title.markdown + 10 + + name + punctuation.definition.string.begin.markdown + 11 name - punctuation.definition.string.begin.markdown + punctuation.definition.string.end.markdown 12 name - punctuation.definition.string.end.markdown + string.other.link.description.title.markdown 13 name - string.other.link.description.title.markdown + punctuation.definition.string.begin.markdown 14 - - name - punctuation.definition.string.begin.markdown - - 15 name punctuation.definition.string.end.markdown - 16 + 15 name punctuation.definition.metadata.markdown @@ -3551,24 +3545,19 @@ 5 name - invalid.illegal.whitespace.markdown + punctuation.definition.metadata.markdown 6 name - punctuation.definition.metadata.markdown + punctuation.definition.link.markdown 7 - - name - punctuation.definition.link.markdown - - 8 name markup.underline.link.markdown - 9 + 8 name punctuation.definition.link.markdown @@ -3578,7 +3567,6 @@ (?x: (\[)((?<square>[^\[\]\\]|\\.|\[\g<square>*+\])*+)(\]) # Match the link text. - ([ ])? # Space not allowed (\() # Opening paren for url (<?)(.*?)(>?) # The url [ \t]* # Optional whitespace diff --git a/extensions/markdown/syntaxes/markdown.tmLanguage.base b/extensions/markdown/syntaxes/markdown.tmLanguage.base index d501f50a86f..b24197713a3 100644 --- a/extensions/markdown/syntaxes/markdown.tmLanguage.base +++ b/extensions/markdown/syntaxes/markdown.tmLanguage.base @@ -681,11 +681,16 @@ name punctuation.definition.string.begin.markdown - 10 + 9 name string.other.link.description.title.markdown + 10 + + name + punctuation.definition.string.markdown + 11 name @@ -694,12 +699,12 @@ 12 name - punctuation.definition.string.markdown + string.other.link.description.title.markdown 13 name - string.other.link.description.title.markdown + punctuation.definition.string.markdown 14 @@ -707,11 +712,6 @@ punctuation.definition.string.markdown 15 - - name - punctuation.definition.string.markdown - - 16 name punctuation.definition.metadata.markdown @@ -729,24 +729,19 @@ 5 name - invalid.illegal.whitespace.markdown + punctuation.definition.metadata.markdown 6 name - punctuation.definition.metadata.markdown + punctuation.definition.link.markdown 7 - - name - punctuation.definition.link.markdown - - 8 name markup.underline.link.image.markdown - 9 + 8 name punctuation.definition.link.markdown @@ -756,7 +751,6 @@ (?x: (\!\[)((?<square>[^\[\]\\]|\\.|\[\g<square>*+\])*+)(\]) # Match the link text. - ([ ])? # Space not allowed (\() # Opening paren for url (<?)(\S+?)(>?) # The url [ \t]* # Optional whitespace @@ -993,37 +987,37 @@ name punctuation.definition.string.begin.markdown - 10 + 9 name string.other.link.description.title.markdown + 10 + + name + punctuation.definition.string.begin.markdown + 11 name - punctuation.definition.string.begin.markdown + punctuation.definition.string.end.markdown 12 name - punctuation.definition.string.end.markdown + string.other.link.description.title.markdown 13 name - string.other.link.description.title.markdown + punctuation.definition.string.begin.markdown 14 - - name - punctuation.definition.string.begin.markdown - - 15 name punctuation.definition.string.end.markdown - 16 + 15 name punctuation.definition.metadata.markdown @@ -1041,24 +1035,19 @@ 5 name - invalid.illegal.whitespace.markdown + punctuation.definition.metadata.markdown 6 name - punctuation.definition.metadata.markdown + punctuation.definition.link.markdown 7 - - name - punctuation.definition.link.markdown - - 8 name markup.underline.link.markdown - 9 + 8 name punctuation.definition.link.markdown @@ -1068,7 +1057,6 @@ (?x: (\[)((?<square>[^\[\]\\]|\\.|\[\g<square>*+\])*+)(\]) # Match the link text. - ([ ])? # Space not allowed (\() # Opening paren for url (<?)(.*?)(>?) # The url [ \t]* # Optional whitespace From ab91623f96021f47f762578e157a6ed69e9fd62d Mon Sep 17 00:00:00 2001 From: Sandeep Somavarapu Date: Tue, 14 Nov 2017 21:28:56 +0100 Subject: [PATCH 6/6] Fix #38293 --- src/vs/workbench/parts/extensions/browser/extensionEditor.ts | 2 ++ .../parts/extensions/node/extensionsWorkbenchService.ts | 1 + 2 files changed, 3 insertions(+) diff --git a/src/vs/workbench/parts/extensions/browser/extensionEditor.ts b/src/vs/workbench/parts/extensions/browser/extensionEditor.ts index 5a18d080734..ae750dc7b8f 100644 --- a/src/vs/workbench/parts/extensions/browser/extensionEditor.ts +++ b/src/vs/workbench/parts/extensions/browser/extensionEditor.ts @@ -479,6 +479,8 @@ export class ExtensionEditor extends BaseEditor { append(this.content, scrollableContent.getDomNode()); this.contentDisposables.push(scrollableContent); } + }, () => { + append(this.content, $('p.nocontent')).textContent = localize('noContributions', "No Contributions"); })); } diff --git a/src/vs/workbench/parts/extensions/node/extensionsWorkbenchService.ts b/src/vs/workbench/parts/extensions/node/extensionsWorkbenchService.ts index 89aaf329396..bd7aeab4eb9 100644 --- a/src/vs/workbench/parts/extensions/node/extensionsWorkbenchService.ts +++ b/src/vs/workbench/parts/extensions/node/extensionsWorkbenchService.ts @@ -189,6 +189,7 @@ class Extension implements IExtension { return this.galleryService.getManifest(this.gallery); } this.telemetryService.publicLog('extensions:NotFoundManifest', this.telemetryData); + return TPromise.wrapError(new Error('not available')); } return TPromise.as(this.local.manifest);