Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Yarn and code coverage #475

Merged
merged 169 commits into from
Jan 3, 2018
Merged

Conversation

DonJayamanne
Copy link

@DonJayamanne DonJayamanne commented Dec 22, 2017

octref and others added 30 commits November 3, 2017 13:11
* 'master' of https://github.com/Microsoft/vscode-python:
  Fixes #56 list all environments (#219)
  Fixes #57 Disable activation on debugging (#220)
  Fixes #26 Do not run linters when linters are disabled (#222)
* upstream/master:
  Fix typo in README.md (#252)
  Disable linter without workspaces (#241)
* upstream/master:
  Fix feedback service (#246)
  Fix django context initializer (#248)
  disable generation of tags file upon extension load (#264)
* upstream/master:
  Resolve pythonPath before comparing it to shebang (#273)
* upstream/master:
  Fixes #22 to Detect anaconda from known locations  (#221)
  Use workspaceFolder token instead of workspaceRoot (#267)
  Fix registry lookup response (#224)
  Fix issues when running without debugging and debugged code terminates (#249)
* upstream/master:
  Fix debugging tests (#304)
* upstream/master:
  Remove jupyter functionality in favor of Jupyter extension (#302)
  Drop Python 2 URLs (#307)
* upstream/master:
  Remove setting python.formatting.formatOnSave in favor of the vs code setting (#312)
* upstream/master:
  Remove setting linting.lintOnTextChange as it was never implemented (#315)
* upstream/master:
  Fix travis build error (#326)
* upstream/master:
  add new npm deps with improved gulp for dev (#328)
* upstream/master:
  Update version of inversify package (#329)
* upstream/master:
  Document our dev process (#330)
* upstream/master:
  Document contribution to the code along with coding standards (#321)
* upstream/master:
  Add Simplified Chinese translation of commands (#240)
* upstream/master:
  Fix package.json (#347)
* upstream/master:
  #34, #110 - suppress Intellisense in strings and comments (#339)
  Re-factor code python execution framework  (#345)
* upstream/master:
  Fix linters to make use of the new python code execution framework (#360)
  Update the versioning scheme (#356)
  Make npm happy in regards to line endings (#357)
* upstream/master:
  Ensure python path is not set if already set in user settings (#369)
  Use 'an' rather than 'a' before vowel words (#373)
* upstream/master:
  Use new environment variable parser (#362)
* CommonToolExecution:
  remove imports of 'reflect-metadata'
* CompleteCodeExec:
  remove imports of 'reflect-metadata'
* upstream/master:
  Refactor parsing of environment variables (after 439) (#466)
  Refactor extension to remove old way of spawning python processes (#439)
* CommonToolExecution:
  Refactor parsing of environment variables (after 439) (#466)
  Refactor extension to remove old way of spawning python processes (#439)
* CommonToolExecution:
  Refactor parsing of environment variables (after 439) (#466)
  Refactor extension to remove old way of spawning python processes (#439)
@DonJayamanne DonJayamanne changed the title WIP - Yarn and code coverage (after 493) Yarn and code coverage Jan 3, 2018
* upstream/master:
  Common execution for python tool or module (#468)
* CompleteCodeExec:
  Common execution for python tool or module (#468)
* upstream/master:
  Complete refactoring of code to use new code exec engine (#493)
@@ -9,3 +9,5 @@ node_modules
__pycache__
npm-debug.log
**/.mypy_cache/**
!yarn.lock
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why are you explicitly not ignoring yarn.lock instead of just not listing it in the .gitignore file?

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Seems to be getting ignored on my pc and mac. Hence figured i might as well be explicit.
Not sure what I've done to exclude these (i don't recall changing this in my global config)

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

OK, fair enough. I would check your global .gitignore file to see what that has.

@@ -0,0 +1,225 @@
/*---------------------------------------------------------
* Copyright (C) Microsoft Corporation. All rights reserved.
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License.

const remappedCollector: istanbul.Collector = remapIstanbul.remap(coverage, {
warn: warning => {
// We expect some warnings as any JS file without a typescript mapping will cause this.
// By default, we'll skip printing these to the console as it clutters it up
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Missing a period.

// private transformer?: Instrumenter;
private sourceFiles: string[] = [];
private instrumenter: Instrumenter;
// private matchFn: any = undefined;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Commented-out code.

decache(fullPath);
});

// this.matchFn = function (file): boolean { return fileMap[file]; };
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Commented-out code.

// this.matchFn = function (file): boolean { return fileMap[file]; };
const matchFn = (file: string) => fileMap.has(file);
this.sourceFiles = Array.from(fileMap.keys());
// this.matchFn.files = Object.keys(fileMap);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Commented-out code.

// this.transformer = this.instrumenter.instrumentSync.bind(this.instrumenter);
const transformer = this.instrumenter.instrumentSync.bind(this.instrumenter);
const hookOpts = { verbose: false, extensions: ['.js'] };
// istanbul.hook.hookRequire(this.matchFn, this.transformer, hookOpts);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Commented-out code.

@DonJayamanne DonJayamanne merged commit 9853956 into microsoft:master Jan 3, 2018
@DonJayamanne DonJayamanne deleted the YarnAndCodeCoverage branch January 4, 2018 19:49
DonJayamanne added a commit that referenced this pull request Jan 9, 2018
* upstream/master:
  Improve interpreter selection on different platforms (#517)
  Yarn and code coverage (#475)
@lock lock bot locked as resolved and limited conversation to collaborators Jul 31, 2019
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Add code coverage Move to using yarn
3 participants