diff --git a/extensions/markdown/syntaxes/markdown.tmLanguage b/extensions/markdown/syntaxes/markdown.tmLanguage
index 1b6d8f43963..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
@@ -3502,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
@@ -3550,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
diff --git a/extensions/markdown/syntaxes/markdown.tmLanguage.base b/extensions/markdown/syntaxes/markdown.tmLanguage.base
index 7660def31b7..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
@@ -992,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
@@ -1040,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
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 [];
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';
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);
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 @@
-
-
-
+
\ No newline at end of file