Skip to content

Commit

Permalink
Merge pull request #392 from RomanNikitenko/aligh-with-upstream
Browse files Browse the repository at this point in the history
chore: Align with upstream
  • Loading branch information
RomanNikitenko authored Aug 5, 2024
2 parents 576e210 + fccd4da commit afee599
Show file tree
Hide file tree
Showing 315 changed files with 8,258 additions and 2,170 deletions.
3 changes: 2 additions & 1 deletion code/.eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -755,7 +755,8 @@
"vs/base/~",
"vs/base/parts/*/~",
"vs/platform/*/~",
"vs/editor/~"
"vs/editor/~",
"@vscode/tree-sitter-wasm" // node module allowed even in /common/
]
},
{
Expand Down
13 changes: 13 additions & 0 deletions code/.github/commands.json
Original file line number Diff line number Diff line change
Expand Up @@ -169,6 +169,19 @@
"reason": "completed",
"addLabel": "unreleased"
},
{
"type": "comment",
"name": "spam",
"allowUsers": [
"cleidigh",
"usernamehw",
"gjsjohnmurray",
"IllusionMH"
],
"action": "close",
"reason": "not_planned",
"addLabel": "invalid"
},
{
"type": "comment",
"name": "a11ymas",
Expand Down
59 changes: 0 additions & 59 deletions code/.github/workflows/deep-classifier-runner.yml

This file was deleted.

39 changes: 0 additions & 39 deletions code/.github/workflows/deep-classifier-scraper.yml

This file was deleted.

5 changes: 2 additions & 3 deletions code/.github/workflows/feature-request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@ on:
types: [trigger-feature-request-manager]
issues:
types: [milestoned]
schedule:
- cron: 20 2 * * * # 4:20am Zurich

# also make changes in ./on-label.yml
jobs:
Expand All @@ -26,8 +24,9 @@ jobs:
if: github.event_name != 'issues' || contains(github.event.issue.labels.*.name, 'feature-request')
uses: ./actions/feature-request
with:
appInsightsKey: ${{secrets.TRIAGE_ACTIONS_APP_INSIGHTS}}
token: ${{secrets.VSCODE_ISSUE_TRIAGE_BOT_PAT}}
repo: "vscode"
owner: "microsoft"
candidateMilestoneID: 107
candidateMilestoneName: Backlog Candidates
backlogMilestoneID: 8
Expand Down
36 changes: 0 additions & 36 deletions code/.github/workflows/latest-release-monitor.yml

This file was deleted.

30 changes: 0 additions & 30 deletions code/.github/workflows/needs-more-info-closer.yml

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
"description": "Test provider for the VS Code project",
"enabledApiProposals": [
"testObserver",
"testRelatedCode",
"attributableCoverage"
],
"engines": {
Expand Down Expand Up @@ -83,6 +84,7 @@
"dependencies": {
"@jridgewell/trace-mapping": "^0.3.25",
"ansi-styles": "^5.2.0",
"cockatiel": "^3.1.3",
"istanbul-to-vscode": "^2.0.1"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ import {
itemData,
} from './testTree';
import { BrowserTestRunner, PlatformTestRunner, VSCodeTestRunner } from './vscodeTestRunner';
import { ImportGraph } from './importGraph';

const TEST_FILE_PATTERN = 'src/vs/**/*.{test,integrationTest}.ts';

Expand Down Expand Up @@ -51,10 +52,15 @@ export async function activate(context: vscode.ExtensionContext) {
},
}));


ctrl.resolveHandler = async test => {
let initialWatchPromise: Promise<vscode.Disposable> | undefined;
const resolveHandler = async (test?: vscode.TestItem) => {
if (!test) {
context.subscriptions.push(await startWatchingWorkspace(ctrl, fileChangedEmitter));
if (!initialWatchPromise) {
initialWatchPromise = startWatchingWorkspace(ctrl, fileChangedEmitter);
context.subscriptions.push(await initialWatchPromise);
} else {
await initialWatchPromise;
}
return;
}

Expand All @@ -66,10 +72,24 @@ export async function activate(context: vscode.ExtensionContext) {
}
};

ctrl.resolveHandler = resolveHandler;

guessWorkspaceFolder().then(folder => {
if (folder) {
context.subscriptions.push(new FailureTracker(context, folder.uri.fsPath));
if (!folder) {
return;
}

const graph = new ImportGraph(
folder.uri, async () => {
await resolveHandler();
return [...ctrl.items].map(([, item]) => item);
}, uri => ctrl.items.get(uri.toString().toLowerCase()));
ctrl.relatedCodeProvider = graph;

context.subscriptions.push(
new FailureTracker(context, folder.uri.fsPath),
fileChangedEmitter.event(e => graph.didChange(e.uri, e.removed)),
);
});

const createRunHandler = (
Expand Down
Loading

0 comments on commit afee599

Please sign in to comment.