@codingame/monaco-vscode-issue-service-override 25.1.1 → 26.0.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/package.json +2 -2
- package/vscode/src/vs/workbench/contrib/issue/browser/baseIssueReporterService.js +442 -396
- package/vscode/src/vs/workbench/contrib/issue/browser/issue.contribution.js +8 -11
- package/vscode/src/vs/workbench/contrib/issue/browser/issueFormService.js +73 -68
- package/vscode/src/vs/workbench/contrib/issue/browser/issueReporterModel.js +34 -38
- package/vscode/src/vs/workbench/contrib/issue/browser/issueReporterPage.js +148 -144
- package/vscode/src/vs/workbench/contrib/issue/browser/issueReporterService.js +40 -17
- package/vscode/src/vs/workbench/contrib/issue/browser/issueService.js +49 -47
- package/vscode/src/vs/workbench/contrib/issue/browser/issueTroubleshoot.js +100 -89
- package/vscode/src/vs/workbench/contrib/issue/browser/media/issueReporter.css +0 -6
- package/vscode/src/vs/workbench/contrib/issue/common/issue.contribution.js +49 -55
|
@@ -2,172 +2,176 @@
|
|
|
2
2
|
import { escape } from '@codingame/monaco-vscode-api/vscode/vs/base/common/strings';
|
|
3
3
|
import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
|
|
4
4
|
|
|
5
|
-
const sendSystemInfoLabel = escape(( localize(
|
|
6
|
-
const sendProcessInfoLabel = escape(( localize(
|
|
7
|
-
const sendWorkspaceInfoLabel = escape(( localize(
|
|
8
|
-
const sendExtensionsLabel = escape(( localize(
|
|
9
|
-
const sendExperimentsLabel = escape(( localize(
|
|
10
|
-
const sendExtensionData = escape(( localize(
|
|
5
|
+
const sendSystemInfoLabel = escape(( localize(8759, "Include my system information")));
|
|
6
|
+
const sendProcessInfoLabel = escape(( localize(8760, "Include my currently running processes")));
|
|
7
|
+
const sendWorkspaceInfoLabel = escape(( localize(8761, "Include my workspace metadata")));
|
|
8
|
+
const sendExtensionsLabel = escape(( localize(8762, "Include my enabled extensions")));
|
|
9
|
+
const sendExperimentsLabel = escape(( localize(8763, "Include A/B experiment info")));
|
|
10
|
+
const sendExtensionData = escape(( localize(8764, "Include additional extension info")));
|
|
11
11
|
const acknowledgementsLabel = escape(( localize(
|
|
12
|
-
|
|
12
|
+
8765,
|
|
13
13
|
"I acknowledge that my VS Code version is not updated and this issue may be closed."
|
|
14
14
|
)));
|
|
15
15
|
const reviewGuidanceLabel = ( localize(
|
|
16
|
-
|
|
17
|
-
|
|
16
|
+
8766,
|
|
17
|
+
"Before you report an issue here please <a href=\"https://github.com/microsoft/vscode/wiki/Submitting-Bugs-and-Suggestions\" target=\"_blank\">review the guidance we provide</a>. Please complete the form in English."
|
|
18
18
|
));
|
|
19
19
|
var BaseHtml = () => `
|
|
20
20
|
<div id="update-banner" class="issue-reporter-update-banner hidden">
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
21
|
+
<span class="update-banner-text" id="update-banner-text">
|
|
22
|
+
<!-- To be dynamically filled -->
|
|
23
|
+
</span>
|
|
24
24
|
</div>
|
|
25
25
|
<div class="issue-reporter" id="issue-reporter">
|
|
26
|
-
|
|
26
|
+
<div id="english" class="input-group hidden">${escape(( localize(8767, "Please complete the form in English.")))}</div>
|
|
27
27
|
|
|
28
|
-
|
|
28
|
+
<div id="review-guidance-help-text" class="input-group">${reviewGuidanceLabel}</div>
|
|
29
29
|
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
30
|
+
<div class="section">
|
|
31
|
+
<div class="input-group">
|
|
32
|
+
<label class="inline-label" for="issue-type">${escape(( localize(8768, "This is a")))}</label>
|
|
33
|
+
<select id="issue-type" class="inline-form-control">
|
|
34
|
+
<!-- To be dynamically filled -->
|
|
35
|
+
</select>
|
|
36
|
+
</div>
|
|
37
37
|
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
38
|
+
<div class="input-group" id="problem-source">
|
|
39
|
+
<label class="inline-label" for="issue-source">${escape(( localize(8769, "For")))} <span class="required-input">*</span></label>
|
|
40
|
+
<select id="issue-source" class="inline-form-control" required>
|
|
41
|
+
<!-- To be dynamically filled -->
|
|
42
|
+
</select>
|
|
43
|
+
<div id="issue-source-empty-error" class="validation-error hidden" role="alert">${escape(( localize(8770, "An issue source is required.")))}</div>
|
|
44
|
+
<div id="problem-source-help-text" class="instructions hidden">${escape(( localize(
|
|
45
|
+
8771,
|
|
46
46
|
"Try to reproduce the problem after {0}. If the problem only reproduces when extensions are active, it is likely an issue with an extension."
|
|
47
|
-
)))
|
|
48
|
-
|
|
49
|
-
|
|
47
|
+
))).replace(
|
|
48
|
+
"{0}",
|
|
49
|
+
() => `<span tabIndex=0 role="button" id="disableExtensions" class="workbenchCommand">${escape(( localize(8772, "disabling all extensions and reloading the window")))}</span>`
|
|
50
|
+
)}
|
|
51
|
+
</div>
|
|
50
52
|
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
53
|
+
<div id="extension-selection">
|
|
54
|
+
<label class="inline-label" for="extension-selector">${escape(( localize(8773, "Extension")))} <span class="required-input">*</span></label>
|
|
55
|
+
<select id="extension-selector" class="inline-form-control">
|
|
56
|
+
<!-- To be dynamically filled -->
|
|
57
|
+
</select>
|
|
58
|
+
<div id="extension-selection-validation-error" class="validation-error hidden" role="alert">${escape(( localize(
|
|
59
|
+
8774,
|
|
58
60
|
"The issue reporter is unable to create issues for this extension. Please visit {0} to report an issue."
|
|
59
|
-
)))
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
61
|
+
))).replace(
|
|
62
|
+
"{0}",
|
|
63
|
+
() => `<span tabIndex=0 role="button" id="extensionBugsLink" class="workbenchCommand"><!-- To be dynamically filled --></span>`
|
|
64
|
+
)}</div>
|
|
65
|
+
<div id="extension-selection-validation-error-no-url" class="validation-error hidden" role="alert">
|
|
66
|
+
${escape(( localize(
|
|
67
|
+
8775,
|
|
64
68
|
"The issue reporter is unable to create issues for this extension, as it does not specify a URL for reporting issues. Please check the marketplace page of this extension to see if other instructions are available."
|
|
65
69
|
)))}
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
70
|
+
</div>
|
|
71
|
+
</div>
|
|
72
|
+
</div>
|
|
69
73
|
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
74
|
+
<div id="issue-title-container" class="input-group">
|
|
75
|
+
<label class="inline-label" for="issue-title">${escape(( localize(8776, "Title")))} <span class="required-input">*</span></label>
|
|
76
|
+
<input id="issue-title" type="text" class="inline-form-control" placeholder="${escape(( localize(8777, "Please enter a title.")))}" required>
|
|
77
|
+
<div id="issue-title-empty-error" class="validation-error hidden" role="alert">${escape(( localize(8778, "A title is required.")))}</div>
|
|
78
|
+
<div id="issue-title-length-validation-error" class="validation-error hidden" role="alert">${escape(( localize(8779, "The title is too long.")))}</div>
|
|
79
|
+
<small id="similar-issues">
|
|
80
|
+
<!-- To be dynamically filled -->
|
|
81
|
+
</small>
|
|
82
|
+
</div>
|
|
79
83
|
|
|
80
|
-
|
|
84
|
+
</div>
|
|
81
85
|
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
86
|
+
<div class="input-group description-section">
|
|
87
|
+
<label for="description" id="issue-description-label">
|
|
88
|
+
<!-- To be dynamically filled -->
|
|
89
|
+
</label>
|
|
90
|
+
<div class="instructions" id="issue-description-subtitle">
|
|
91
|
+
<!-- To be dynamically filled -->
|
|
92
|
+
</div>
|
|
93
|
+
<div class="block-info-text">
|
|
94
|
+
<textarea name="description" id="description" placeholder="${escape(( localize(8780, "Please enter details.")))}" required></textarea>
|
|
95
|
+
</div>
|
|
96
|
+
<div id="description-empty-error" class="validation-error hidden" role="alert">${escape(( localize(8781, "A description is required.")))}</div>
|
|
97
|
+
<div id="description-short-error" class="validation-error hidden" role="alert">${escape(( localize(8782, "Please provide a longer description.")))}</div>
|
|
98
|
+
</div>
|
|
95
99
|
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
100
|
+
<div class="system-info" id="block-container">
|
|
101
|
+
<div class="block block-extension-data">
|
|
102
|
+
<input class="send-extension-data" aria-label="${sendExtensionData}" type="checkbox" id="includeExtensionData" checked/>
|
|
103
|
+
<label class="extension-caption" id="extension-caption" for="includeExtensionData">
|
|
104
|
+
${sendExtensionData}
|
|
105
|
+
<span id="ext-loading" hidden></span>
|
|
106
|
+
<span class="ext-parens" hidden>(</span><a href="#" class="showInfo" id="extension-id">${escape(( localize(8783, "show")))}</a><span class="ext-parens" hidden>)</span>
|
|
107
|
+
<a id="extension-data-download">${escape(( localize(8784, "Download Extension Data")))}</a>
|
|
108
|
+
</label>
|
|
109
|
+
<pre class="block-info" id="extension-data" placeholder="${escape(( localize(8785, "Extension does not have additional data to include.")))}" style="white-space: pre-wrap; user-select: text;">
|
|
110
|
+
<!-- To be dynamically filled -->
|
|
111
|
+
</pre>
|
|
112
|
+
</div>
|
|
109
113
|
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
|
|
138
|
-
|
|
139
|
-
|
|
140
|
-
|
|
141
|
-
|
|
142
|
-
|
|
143
|
-
|
|
144
|
-
|
|
145
|
-
|
|
146
|
-
|
|
147
|
-
|
|
148
|
-
|
|
149
|
-
|
|
150
|
-
|
|
151
|
-
|
|
152
|
-
|
|
153
|
-
|
|
154
|
-
|
|
155
|
-
|
|
156
|
-
|
|
157
|
-
|
|
158
|
-
|
|
159
|
-
|
|
160
|
-
|
|
161
|
-
|
|
162
|
-
|
|
163
|
-
|
|
164
|
-
|
|
165
|
-
|
|
166
|
-
|
|
167
|
-
|
|
168
|
-
|
|
169
|
-
|
|
170
|
-
|
|
114
|
+
<div class="block block-system">
|
|
115
|
+
<input class="sendData" aria-label="${sendSystemInfoLabel}" type="checkbox" id="includeSystemInfo" checked/>
|
|
116
|
+
<label class="caption" for="includeSystemInfo">
|
|
117
|
+
${sendSystemInfoLabel}
|
|
118
|
+
(<a href="#" class="showInfo">${escape(( localize(8783, "show")))}</a>)
|
|
119
|
+
</label>
|
|
120
|
+
<div class="block-info hidden" style="user-select: text;">
|
|
121
|
+
<!-- To be dynamically filled -->
|
|
122
|
+
</div>
|
|
123
|
+
</div>
|
|
124
|
+
<div class="block block-process">
|
|
125
|
+
<input class="sendData" aria-label="${sendProcessInfoLabel}" type="checkbox" id="includeProcessInfo" checked/>
|
|
126
|
+
<label class="caption" for="includeProcessInfo">
|
|
127
|
+
${sendProcessInfoLabel}
|
|
128
|
+
(<a href="#" class="showInfo">${escape(( localize(8783, "show")))}</a>)
|
|
129
|
+
</label>
|
|
130
|
+
<pre class="block-info hidden" style="user-select: text;">
|
|
131
|
+
<code>
|
|
132
|
+
<!-- To be dynamically filled -->
|
|
133
|
+
</code>
|
|
134
|
+
</pre>
|
|
135
|
+
</div>
|
|
136
|
+
<div class="block block-workspace">
|
|
137
|
+
<input class="sendData" aria-label="${sendWorkspaceInfoLabel}" type="checkbox" id="includeWorkspaceInfo" checked/>
|
|
138
|
+
<label class="caption" for="includeWorkspaceInfo">
|
|
139
|
+
${sendWorkspaceInfoLabel}
|
|
140
|
+
(<a href="#" class="showInfo">${escape(( localize(8783, "show")))}</a>)
|
|
141
|
+
</label>
|
|
142
|
+
<pre id="systemInfo" class="block-info hidden" style="user-select: text;">
|
|
143
|
+
<code>
|
|
144
|
+
<!-- To be dynamically filled -->
|
|
145
|
+
</code>
|
|
146
|
+
</pre>
|
|
147
|
+
</div>
|
|
148
|
+
<div class="block block-extensions">
|
|
149
|
+
<input class="sendData" aria-label="${sendExtensionsLabel}" type="checkbox" id="includeExtensions" checked/>
|
|
150
|
+
<label class="caption" for="includeExtensions">
|
|
151
|
+
${sendExtensionsLabel}
|
|
152
|
+
(<a href="#" class="showInfo">${escape(( localize(8783, "show")))}</a>)
|
|
153
|
+
</label>
|
|
154
|
+
<div id="systemInfo" class="block-info hidden" style="user-select: text;">
|
|
155
|
+
<!-- To be dynamically filled -->
|
|
156
|
+
</div>
|
|
157
|
+
</div>
|
|
158
|
+
<div class="block block-experiments">
|
|
159
|
+
<input class="sendData" aria-label="${sendExperimentsLabel}" type="checkbox" id="includeExperiments" checked/>
|
|
160
|
+
<label class="caption" for="includeExperiments">
|
|
161
|
+
${sendExperimentsLabel}
|
|
162
|
+
(<a href="#" class="showInfo">${escape(( localize(8783, "show")))}</a>)
|
|
163
|
+
</label>
|
|
164
|
+
<pre class="block-info hidden" style="user-select: text;">
|
|
165
|
+
<!-- To be dynamically filled -->
|
|
166
|
+
</pre>
|
|
167
|
+
</div>
|
|
168
|
+
<div class="block block-acknowledgements hidden" id="version-acknowledgements">
|
|
169
|
+
<input class="sendData" aria-label="${acknowledgementsLabel}" type="checkbox" id="includeAcknowledgement"/>
|
|
170
|
+
<label class="caption" for="includeAcknowledgement">
|
|
171
|
+
${acknowledgementsLabel}
|
|
172
|
+
</label>
|
|
173
|
+
</div>
|
|
174
|
+
</div>
|
|
171
175
|
|
|
172
176
|
</div>`;
|
|
173
177
|
|
|
@@ -11,25 +11,56 @@ import { IIssueFormService } from '@codingame/monaco-vscode-api/vscode/vs/workbe
|
|
|
11
11
|
import { BaseIssueReporterService } from './baseIssueReporterService.js';
|
|
12
12
|
|
|
13
13
|
let IssueWebReporter = class IssueWebReporter extends BaseIssueReporterService {
|
|
14
|
-
constructor(
|
|
15
|
-
|
|
16
|
-
|
|
14
|
+
constructor(
|
|
15
|
+
disableExtensions,
|
|
16
|
+
data,
|
|
17
|
+
os,
|
|
18
|
+
product,
|
|
19
|
+
window,
|
|
20
|
+
issueFormService,
|
|
21
|
+
themeService,
|
|
22
|
+
fileService,
|
|
23
|
+
fileDialogService,
|
|
24
|
+
contextMenuService,
|
|
25
|
+
authenticationService,
|
|
26
|
+
openerService
|
|
27
|
+
) {
|
|
28
|
+
super(
|
|
29
|
+
disableExtensions,
|
|
30
|
+
data,
|
|
31
|
+
os,
|
|
32
|
+
product,
|
|
33
|
+
window,
|
|
34
|
+
true,
|
|
35
|
+
issueFormService,
|
|
36
|
+
themeService,
|
|
37
|
+
fileService,
|
|
38
|
+
fileDialogService,
|
|
39
|
+
contextMenuService,
|
|
40
|
+
authenticationService,
|
|
41
|
+
openerService
|
|
42
|
+
);
|
|
43
|
+
const target = this.window.document.querySelector(".block-system .block-info");
|
|
17
44
|
const webInfo = this.window.navigator.userAgent;
|
|
18
45
|
if (webInfo) {
|
|
19
46
|
target?.appendChild(this.window.document.createTextNode(webInfo));
|
|
20
47
|
this.receivedSystemInfo = true;
|
|
21
|
-
this.issueReporterModel.update({
|
|
48
|
+
this.issueReporterModel.update({
|
|
49
|
+
systemInfoWeb: webInfo
|
|
50
|
+
});
|
|
22
51
|
}
|
|
23
52
|
this.setEventHandlers();
|
|
24
53
|
}
|
|
25
54
|
setEventHandlers() {
|
|
26
55
|
super.setEventHandlers();
|
|
27
|
-
this.addEventListener(
|
|
56
|
+
this.addEventListener("issue-type", "change", event => {
|
|
28
57
|
const issueType = parseInt(event.target.value);
|
|
29
|
-
this.issueReporterModel.update({
|
|
30
|
-
|
|
58
|
+
this.issueReporterModel.update({
|
|
59
|
+
issueType: issueType
|
|
60
|
+
});
|
|
61
|
+
const descriptionTextArea = this.getElementById("issue-title");
|
|
31
62
|
if (descriptionTextArea) {
|
|
32
|
-
descriptionTextArea.placeholder = ( localize(
|
|
63
|
+
descriptionTextArea.placeholder = ( localize(8786, "Please enter a title"));
|
|
33
64
|
}
|
|
34
65
|
this.updateButtonStates();
|
|
35
66
|
this.setSourceOptions();
|
|
@@ -37,14 +68,6 @@ let IssueWebReporter = class IssueWebReporter extends BaseIssueReporterService {
|
|
|
37
68
|
});
|
|
38
69
|
}
|
|
39
70
|
};
|
|
40
|
-
IssueWebReporter = ( __decorate([
|
|
41
|
-
( __param(5, IIssueFormService)),
|
|
42
|
-
( __param(6, IThemeService)),
|
|
43
|
-
( __param(7, IFileService)),
|
|
44
|
-
( __param(8, IFileDialogService)),
|
|
45
|
-
( __param(9, IContextMenuService)),
|
|
46
|
-
( __param(10, IAuthenticationService)),
|
|
47
|
-
( __param(11, IOpenerService))
|
|
48
|
-
], IssueWebReporter));
|
|
71
|
+
IssueWebReporter = ( __decorate([( __param(5, IIssueFormService)), ( __param(6, IThemeService)), ( __param(7, IFileService)), ( __param(8, IFileDialogService)), ( __param(9, IContextMenuService)), ( __param(10, IAuthenticationService)), ( __param(11, IOpenerService))], IssueWebReporter));
|
|
49
72
|
|
|
50
73
|
export { IssueWebReporter };
|
|
@@ -32,7 +32,20 @@ import { IExtensionService } from '@codingame/monaco-vscode-api/vscode/vs/workbe
|
|
|
32
32
|
import { IIntegrityService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/integrity/common/integrity.service';
|
|
33
33
|
|
|
34
34
|
let BrowserIssueService = class BrowserIssueService {
|
|
35
|
-
constructor(
|
|
35
|
+
constructor(
|
|
36
|
+
extensionService,
|
|
37
|
+
productService,
|
|
38
|
+
issueFormService,
|
|
39
|
+
themeService,
|
|
40
|
+
experimentService,
|
|
41
|
+
workspaceTrustManagementService,
|
|
42
|
+
integrityService,
|
|
43
|
+
extensionManagementService,
|
|
44
|
+
extensionEnablementService,
|
|
45
|
+
authenticationService,
|
|
46
|
+
configurationService,
|
|
47
|
+
openerService
|
|
48
|
+
) {
|
|
36
49
|
this.extensionService = extensionService;
|
|
37
50
|
this.productService = productService;
|
|
38
51
|
this.issueFormService = issueFormService;
|
|
@@ -47,12 +60,14 @@ let BrowserIssueService = class BrowserIssueService {
|
|
|
47
60
|
this.openerService = openerService;
|
|
48
61
|
}
|
|
49
62
|
async openReporter(options) {
|
|
50
|
-
if (!this.configurationService.getValue(
|
|
63
|
+
if (!this.configurationService.getValue("issueReporter.experimental.webReporter")) {
|
|
51
64
|
const extensionId = options.extensionId;
|
|
52
65
|
if (!extensionId) {
|
|
53
66
|
if (this.productService.reportIssueUrl) {
|
|
54
67
|
const uri = this.getIssueUriFromStaticContent(this.productService.reportIssueUrl);
|
|
55
|
-
await this.openerService.open(uri, {
|
|
68
|
+
await this.openerService.open(uri, {
|
|
69
|
+
openExternal: true
|
|
70
|
+
});
|
|
56
71
|
return;
|
|
57
72
|
}
|
|
58
73
|
throw ( new Error(`No issue reporting URL configured for ${this.productService.nameLong}.`));
|
|
@@ -63,33 +78,35 @@ let BrowserIssueService = class BrowserIssueService {
|
|
|
63
78
|
throw ( new Error(`Unable to find issue reporting url for ${extensionId}`));
|
|
64
79
|
}
|
|
65
80
|
const uri = this.getIssueUriFromStaticContent(`${extensionGitHubUrl}/issues/new`, selectedExtension);
|
|
66
|
-
await this.openerService.open(uri, {
|
|
81
|
+
await this.openerService.open(uri, {
|
|
82
|
+
openExternal: true
|
|
83
|
+
});
|
|
67
84
|
}
|
|
68
85
|
if (this.productService.reportIssueUrl) {
|
|
69
86
|
const theme = this.themeService.getColorTheme();
|
|
70
87
|
const experiments = await this.experimentService.getCurrentExperiments();
|
|
71
|
-
let githubAccessToken =
|
|
88
|
+
let githubAccessToken = "";
|
|
72
89
|
try {
|
|
73
|
-
const githubSessions = await this.authenticationService.getSessions(
|
|
74
|
-
const potentialSessions = githubSessions.filter(session => session.scopes.includes(
|
|
90
|
+
const githubSessions = await this.authenticationService.getSessions("github");
|
|
91
|
+
const potentialSessions = githubSessions.filter(session => session.scopes.includes("repo"));
|
|
75
92
|
githubAccessToken = potentialSessions[0]?.accessToken;
|
|
76
|
-
}
|
|
77
|
-
catch (e) {
|
|
78
|
-
}
|
|
93
|
+
} catch (e) {}
|
|
79
94
|
let isUnsupported = false;
|
|
80
95
|
try {
|
|
81
96
|
isUnsupported = !(await this.integrityService.isPure()).isPure;
|
|
82
|
-
}
|
|
83
|
-
catch (e) {
|
|
84
|
-
}
|
|
97
|
+
} catch (e) {}
|
|
85
98
|
const extensionData = [];
|
|
86
99
|
try {
|
|
87
100
|
const extensions = await this.extensionManagementService.getInstalled();
|
|
88
|
-
const enabledExtensions = extensions.filter(
|
|
89
|
-
|
|
90
|
-
|
|
101
|
+
const enabledExtensions = extensions.filter(
|
|
102
|
+
extension => this.extensionEnablementService.isEnabled(extension) || (options.extensionId && extension.identifier.id === options.extensionId)
|
|
103
|
+
);
|
|
104
|
+
extensionData.push(...( enabledExtensions.map(extension => {
|
|
105
|
+
const {
|
|
106
|
+
manifest
|
|
107
|
+
} = extension;
|
|
91
108
|
const manifestKeys = manifest.contributes ? ( Object.keys(manifest.contributes)) : [];
|
|
92
|
-
const isTheme = !manifest.main && !manifest.browser && manifestKeys.length === 1 && manifestKeys[0] ===
|
|
109
|
+
const isTheme = !manifest.main && !manifest.browser && manifestKeys.length === 1 && manifestKeys[0] === "themes";
|
|
93
110
|
const isBuiltin = extension.type === ExtensionType.System;
|
|
94
111
|
return {
|
|
95
112
|
name: manifest.name,
|
|
@@ -103,20 +120,19 @@ let BrowserIssueService = class BrowserIssueService {
|
|
|
103
120
|
uri: options.uri,
|
|
104
121
|
isTheme,
|
|
105
122
|
isBuiltin,
|
|
106
|
-
extensionData:
|
|
123
|
+
extensionData: "Extensions data loading"
|
|
107
124
|
};
|
|
108
125
|
})));
|
|
109
|
-
}
|
|
110
|
-
catch (e) {
|
|
126
|
+
} catch (e) {
|
|
111
127
|
extensionData.push({
|
|
112
|
-
name:
|
|
113
|
-
publisher:
|
|
114
|
-
version:
|
|
128
|
+
name: "Workbench Issue Service",
|
|
129
|
+
publisher: "Unknown",
|
|
130
|
+
version: "Unknown",
|
|
115
131
|
repositoryUrl: undefined,
|
|
116
132
|
bugsUrl: undefined,
|
|
117
133
|
extensionData: `Extensions not loaded: ${e}`,
|
|
118
134
|
displayName: `Extensions not loaded: ${e}`,
|
|
119
|
-
id:
|
|
135
|
+
id: "workbench.issue",
|
|
120
136
|
isTheme: false,
|
|
121
137
|
isBuiltin: true
|
|
122
138
|
});
|
|
@@ -125,7 +141,7 @@ let BrowserIssueService = class BrowserIssueService {
|
|
|
125
141
|
styles: getIssueReporterStyles(theme),
|
|
126
142
|
zoomLevel: getZoomLevel(mainWindow),
|
|
127
143
|
enabledExtensions: extensionData,
|
|
128
|
-
experiments: experiments?.join(
|
|
144
|
+
experiments: experiments?.join("\n"),
|
|
129
145
|
restrictedMode: !this.workspaceTrustManagementService.isWorkspaceTrusted(),
|
|
130
146
|
isUnsupported,
|
|
131
147
|
githubAccessToken
|
|
@@ -138,13 +154,12 @@ let BrowserIssueService = class BrowserIssueService {
|
|
|
138
154
|
if (extension.isBuiltin && this.productService.reportIssueUrl) {
|
|
139
155
|
return normalizeGitHubUrl(this.productService.reportIssueUrl);
|
|
140
156
|
}
|
|
141
|
-
let repositoryUrl =
|
|
157
|
+
let repositoryUrl = "";
|
|
142
158
|
const bugsUrl = extension?.bugs?.url;
|
|
143
159
|
const extensionUrl = extension?.repository?.url;
|
|
144
160
|
if (bugsUrl && bugsUrl.match(/^https?:\/\/github\.com\/(.*)/)) {
|
|
145
161
|
repositoryUrl = normalizeGitHubUrl(bugsUrl);
|
|
146
|
-
}
|
|
147
|
-
else if (extensionUrl && extensionUrl.match(/^https?:\/\/github\.com\/(.*)/)) {
|
|
162
|
+
} else if (extensionUrl && extensionUrl.match(/^https?:\/\/github\.com\/(.*)/)) {
|
|
148
163
|
repositoryUrl = normalizeGitHubUrl(extensionUrl);
|
|
149
164
|
}
|
|
150
165
|
return repositoryUrl;
|
|
@@ -153,28 +168,15 @@ let BrowserIssueService = class BrowserIssueService {
|
|
|
153
168
|
const issueDescription = `ADD ISSUE DESCRIPTION HERE
|
|
154
169
|
|
|
155
170
|
Version: ${this.productService.version}
|
|
156
|
-
Commit: ${this.productService.commit ??
|
|
157
|
-
User Agent: ${userAgent ??
|
|
158
|
-
Embedder: ${this.productService.embedderIdentifier ??
|
|
159
|
-
${extension?.version ? `\nExtension version: ${extension.version}` :
|
|
171
|
+
Commit: ${this.productService.commit ?? "unknown"}
|
|
172
|
+
User Agent: ${userAgent ?? "unknown"}
|
|
173
|
+
Embedder: ${this.productService.embedderIdentifier ?? "unknown"}
|
|
174
|
+
${extension?.version ? `\nExtension version: ${extension.version}` : ""}
|
|
160
175
|
<!-- generated by web issue reporter -->`;
|
|
161
176
|
return `${baseUri}?body=${encodeURIComponent(issueDescription)}&labels=web`;
|
|
162
177
|
}
|
|
163
178
|
};
|
|
164
|
-
BrowserIssueService = ( __decorate([
|
|
165
|
-
( __param(0, IExtensionService)),
|
|
166
|
-
( __param(1, IProductService)),
|
|
167
|
-
( __param(2, IIssueFormService)),
|
|
168
|
-
( __param(3, IThemeService)),
|
|
169
|
-
( __param(4, IWorkbenchAssignmentService)),
|
|
170
|
-
( __param(5, IWorkspaceTrustManagementService)),
|
|
171
|
-
( __param(6, IIntegrityService)),
|
|
172
|
-
( __param(7, IExtensionManagementService)),
|
|
173
|
-
( __param(8, IWorkbenchExtensionEnablementService)),
|
|
174
|
-
( __param(9, IAuthenticationService)),
|
|
175
|
-
( __param(10, IConfigurationService)),
|
|
176
|
-
( __param(11, IOpenerService))
|
|
177
|
-
], BrowserIssueService));
|
|
179
|
+
BrowserIssueService = ( __decorate([( __param(0, IExtensionService)), ( __param(1, IProductService)), ( __param(2, IIssueFormService)), ( __param(3, IThemeService)), ( __param(4, IWorkbenchAssignmentService)), ( __param(5, IWorkspaceTrustManagementService)), ( __param(6, IIntegrityService)), ( __param(7, IExtensionManagementService)), ( __param(8, IWorkbenchExtensionEnablementService)), ( __param(9, IAuthenticationService)), ( __param(10, IConfigurationService)), ( __param(11, IOpenerService))], BrowserIssueService));
|
|
178
180
|
function getIssueReporterStyles(theme) {
|
|
179
181
|
return {
|
|
180
182
|
backgroundColor: getColor(theme, SIDE_BAR_BACKGROUND),
|
|
@@ -193,7 +195,7 @@ function getIssueReporterStyles(theme) {
|
|
|
193
195
|
buttonHoverBackground: getColor(theme, buttonHoverBackground),
|
|
194
196
|
sliderActiveColor: getColor(theme, scrollbarSliderActiveBackground),
|
|
195
197
|
sliderBackgroundColor: getColor(theme, scrollbarSliderBackground),
|
|
196
|
-
sliderHoverColor: getColor(theme, scrollbarSliderHoverBackground)
|
|
198
|
+
sliderHoverColor: getColor(theme, scrollbarSliderHoverBackground)
|
|
197
199
|
};
|
|
198
200
|
}
|
|
199
201
|
function getColor(theme, key) {
|