Skip to content

Commit 02e728e

Browse files
alexdimaalexdima
committed
Merge remote-tracking branch 'origin/master' into alex/semantic-document-range
2 parents 6af3539 + ac7d506 commit 02e728e

225 files changed

Lines changed: 3867 additions & 18034 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/ISSUE_TEMPLATE/bug_report.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
name: Bug report
33
about: Create a report to help us improve
44
---
5+
<!-- ⚠️⚠️ Do Not Delete This! bug_report_template ⚠️⚠️ -->
56
<!-- Please read our Rules of Conduct: https://opensource.microsoft.com/codeofconduct/ -->
67
<!-- Please search existing issues to avoid creating duplicates. -->
78
<!-- Also please test using the latest insiders build to make sure your issue has not already been fixed: https://code.visualstudio.com/insiders/ -->

‎.github/ISSUE_TEMPLATE/feature_request.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ about: Suggest an idea for this project
44

55
---
66

7-
<!-- Please leave this comment intact to help us with managing issues. NEEDS_VERSION_INFO_IGNORE -->
7+
<!-- ⚠️⚠️ Do Not Delete This! feature_request_template ⚠️⚠️ -->
88
<!-- Please read our Rules of Conduct: https://opensource.microsoft.com/codeofconduct/ -->
99
<!-- Please search existing issues to avoid creating duplicates. -->
1010

‎.github/commands.json‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -135,6 +135,14 @@
135135
"removeLabel": "~needs more info",
136136
"comment": "Thanks for creating this issue! We figured it's missing some basic information or in some other way doesn't follow our [issue reporting](https://aka.ms/vscodeissuereporting) guidelines. Please take the time to review these and update the issue.\n\nHappy Coding!"
137137
},
138+
{
139+
"type": "label",
140+
"name": "~needs version info",
141+
"action": "updateLabels",
142+
"addLabel": "needs more info",
143+
"removeLabel": "~needs version info",
144+
"comment": "Thanks for creating this issue! We figured it's missing some basic information, such as a version number, or in some other way doesn't follow our [issue reporting](https://aka.ms/vscodeissuereporting) guidelines. Please take the time to review these and update the issue.\n\nHappy Coding!"
145+
},
138146
{
139147
"type": "comment",
140148
"name": "a11ymas",

‎.github/locker.yml‎

Lines changed: 0 additions & 6 deletions
This file was deleted.

‎.github/workflows/commands.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
uses: actions/checkout@v2
1414
with:
1515
repository: 'JacksonKearl/vscode-triage-github-actions'
16-
ref: v6
16+
ref: v9
1717
- name: Run Commands
1818
uses: ./commands
1919
with:

‎.github/workflows/copycat.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
uses: actions/checkout@v2
1212
with:
1313
repository: 'JacksonKearl/vscode-triage-github-actions'
14-
ref: v6
14+
ref: v9
1515
- name: Run CopyCat (JacksonKearl/testissues)
1616
uses: ./copycat
1717
with:

‎.github/workflows/locker.yml‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
name: Locker
2+
on:
3+
schedule:
4+
- cron: 0 * * * *
5+
6+
jobs:
7+
main:
8+
runs-on: ubuntu-latest
9+
steps:
10+
- name: Checkout Actions
11+
uses: actions/checkout@v2
12+
with:
13+
repository: 'JacksonKearl/vscode-triage-github-actions'
14+
ref: v9
15+
- name: Run Locker
16+
uses: ./locker
17+
with:
18+
daysSinceClose: 1000
19+
daysSinceUpdate: 3
20+
ignoredLabel: "*out-of-scope"

‎.github/workflows/needs-version-info.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,13 @@ jobs:
1111
uses: actions/checkout@v2
1212
with:
1313
repository: 'JacksonKearl/vscode-triage-github-actions'
14-
ref: v6
14+
ref: v9
1515
- name: Run Needs Version Info
1616
uses: ./needs-more-info
1717
with:
1818
token: ${{secrets.VSCODE_ISSUE_TRIAGE_BOT_PAT}}
1919
matcher: '\b(\d\.\d{2,3}\.\d|insiders?|1\.\d\d\d?)\b'
20-
tags: NEEDS_VERSION_INFO_IGNORE
20+
tags: feature_request_template
2121
bots: vscodebot|vscode-triage-bot
2222
comment: "Thanks for creating this issue! We detected it's missing some basic information, such as your VS Code and operating system versions, or in some other way doesn't follow our [issue reporting](https://aka.ms/vscodeissuereporting) guidelines. Please take the time to review these guidelines and update the issue.\n\nThis comment will go away once sufficient information is included in your issue.\n\nHappy Coding!"
2323
label: needs more info

‎build/lib/i18n.resources.json‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -126,10 +126,6 @@
126126
"name": "vs/workbench/contrib/quickaccess",
127127
"project": "vscode-workbench"
128128
},
129-
{
130-
"name": "vs/workbench/contrib/quickopen",
131-
"project": "vscode-workbench"
132-
},
133129
{
134130
"name": "vs/workbench/contrib/userData",
135131
"project": "vscode-workbench"

‎extensions/merge-conflict/src/documentTracker.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ class OriginDocumentMergeConflictTracker implements interfaces.IDocumentMergeCon
4949

5050
export default class DocumentMergeConflictTracker implements vscode.Disposable, interfaces.IDocumentMergeConflictTrackerService {
5151
private cache: Map<string, ScanTask> = new Map();
52-
private delayExpireTime: number = 250;
52+
private delayExpireTime: number = 0;
5353

5454
getConflicts(document: vscode.TextDocument, origin: string): PromiseLike<interfaces.IDocumentMergeConflict[]> {
5555
// Attempt from cache

0 commit comments

Comments
 (0)