mirror of
https://github.com/Microsoft/vscode
synced 2024-09-19 10:40:41 +00:00
Merge branch 'master' into electron-4.0.x
This commit is contained in:
commit
e939e52122
|
@ -389,8 +389,6 @@ export class InputBox extends Widget {
|
||||||
let div: HTMLElement;
|
let div: HTMLElement;
|
||||||
let layout = () => div.style.width = dom.getTotalWidth(this.element) + 'px';
|
let layout = () => div.style.width = dom.getTotalWidth(this.element) + 'px';
|
||||||
|
|
||||||
this.state = 'open';
|
|
||||||
|
|
||||||
this.contextViewProvider.showContextView({
|
this.contextViewProvider.showContextView({
|
||||||
getAnchor: () => this.element,
|
getAnchor: () => this.element,
|
||||||
anchorAlignment: AnchorAlignment.RIGHT,
|
anchorAlignment: AnchorAlignment.RIGHT,
|
||||||
|
@ -426,6 +424,8 @@ export class InputBox extends Widget {
|
||||||
},
|
},
|
||||||
layout: layout
|
layout: layout
|
||||||
});
|
});
|
||||||
|
|
||||||
|
this.state = 'open';
|
||||||
}
|
}
|
||||||
|
|
||||||
private _hideMessage(): void {
|
private _hideMessage(): void {
|
||||||
|
|
|
@ -52,7 +52,7 @@ export class LightBulbWidget extends Disposable implements IContentWidget {
|
||||||
|
|
||||||
// Make sure that focus / cursor location is not lost when clicking widget icon
|
// Make sure that focus / cursor location is not lost when clicking widget icon
|
||||||
this._editor.focus();
|
this._editor.focus();
|
||||||
e.preventDefault();
|
dom.EventHelper.stop(e, true);
|
||||||
// a bit of extra work to make sure the menu
|
// a bit of extra work to make sure the menu
|
||||||
// doesn't cover the line-text
|
// doesn't cover the line-text
|
||||||
const { top, height } = dom.getDomNodePagePosition(this._domNode);
|
const { top, height } = dom.getDomNodePagePosition(this._domNode);
|
||||||
|
|
|
@ -673,7 +673,7 @@ export class ExtensionGalleryService implements IExtensionGalleryService {
|
||||||
/* __GDPR__
|
/* __GDPR__
|
||||||
"galleryService:requestError" : {
|
"galleryService:requestError" : {
|
||||||
"url" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
|
"url" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
|
||||||
"cdn": { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
|
"cdn": { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
|
||||||
"message": { "classification": "CallstackOrException", "purpose": "FeatureInsight" }
|
"message": { "classification": "CallstackOrException", "purpose": "FeatureInsight" }
|
||||||
}
|
}
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -270,10 +270,10 @@ class CodeActionOnSaveParticipant implements ISaveParticipant {
|
||||||
if (CodeActionKind.SourceFixAll.contains(b)) {
|
if (CodeActionKind.SourceFixAll.contains(b)) {
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
return 1;
|
return -1;
|
||||||
}
|
}
|
||||||
if (CodeActionKind.SourceFixAll.contains(b)) {
|
if (CodeActionKind.SourceFixAll.contains(b)) {
|
||||||
return -1;
|
return 1;
|
||||||
}
|
}
|
||||||
return 0;
|
return 0;
|
||||||
});
|
});
|
||||||
|
|
|
@ -98,7 +98,7 @@ export class CommentsModel {
|
||||||
const index = firstIndex(matchingResourceData.commentThreads, (commentThread) => commentThread.threadId === thread.threadId);
|
const index = firstIndex(matchingResourceData.commentThreads, (commentThread) => commentThread.threadId === thread.threadId);
|
||||||
if (index >= 0) {
|
if (index >= 0) {
|
||||||
matchingResourceData.commentThreads[index] = ResourceWithCommentThreads.createCommentNode(URI.parse(matchingResourceData.id), thread);
|
matchingResourceData.commentThreads[index] = ResourceWithCommentThreads.createCommentNode(URI.parse(matchingResourceData.id), thread);
|
||||||
} else {
|
} else if (thread.comments && thread.comments.length) {
|
||||||
matchingResourceData.commentThreads.push(ResourceWithCommentThreads.createCommentNode(URI.parse(matchingResourceData.id), thread));
|
matchingResourceData.commentThreads.push(ResourceWithCommentThreads.createCommentNode(URI.parse(matchingResourceData.id), thread));
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
|
@ -989,8 +989,8 @@ export class ExtensionTipsService extends Disposable implements IExtensionTipsSe
|
||||||
}), StorageScope.WORKSPACE);
|
}), StorageScope.WORKSPACE);
|
||||||
/* __GDPR__
|
/* __GDPR__
|
||||||
"dynamicWorkspaceRecommendations" : {
|
"dynamicWorkspaceRecommendations" : {
|
||||||
"count" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" },
|
"count" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true },
|
||||||
"cache" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
|
"cache" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true }
|
||||||
}
|
}
|
||||||
*/
|
*/
|
||||||
this.telemetryService.publicLog('dynamicWorkspaceRecommendations', { count: this._dynamicWorkspaceRecommendations.length, cache: 0 });
|
this.telemetryService.publicLog('dynamicWorkspaceRecommendations', { count: this._dynamicWorkspaceRecommendations.length, cache: 0 });
|
||||||
|
|
Loading…
Reference in a new issue