-
Notifications
You must be signed in to change notification settings - Fork 29.7k
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
[WIP] Use WSL PHP for validation #25576
Closed
Closed
Changes from 1 commit
Commits
Show all changes
2935 commits
Select commit
Hold shift + click to select a range
11e3f1b
failover nsfw to gulp-watch
joaomoreno c45cdff
resolveFiles returns IResolveFileResult
isidorn 1f0e189
fixes #29239
isidorn c854b69
rename and null check
isidorn b57f814
Editor response is slower now, wait before navigating within it.
michelkaporin 17a32a2
Updated readme after JS->TS refactorings.
michelkaporin b80abab
fixes #29537
joaomoreno af8a3e5
fixes #29535
joaomoreno 98fa497
fixes #29350
joaomoreno ad57b3c
fixes #29349
joaomoreno dd07972
fixes #27488
joaomoreno 468dcd2
Fixed #29559 Multi root folders view name is not updated on removing …
foreverest d9bae43
fixes #26034
joaomoreno 96b687b
More detailed error when obtaining editor text fails.
michelkaporin a24b299
clear quick open input if user canceled dialog
bpasero 9c24e9a
fix #29594
bpasero 74abb32
auto assign snippet issues
jrieken 2cdeb68
Do not trimForExclusions (fixes #29520) (#29632)
chrmarti 2672ba2
Restore trimForExclusions to fileSearch glob.parse
roblourens e8943d8
Add editor sublabels, perf-profile
chrmarti 410af6d
Support updating existing item in tasks.json with problem matchers
dbaeumer 14d457e
Fixes #29573: 'group' property is not an object literal in tasks.json
dbaeumer 19f310a
Fixes #29427 & #29617
dbaeumer 29bb20c
Adopt tasks.json to new schema
dbaeumer 75082c7
Fixes #29628: Show Task Log opens Output pane instead of Integrated T…
dbaeumer fe276c9
Fixes #29623: Restart task is not triggered from command and top leve…
dbaeumer 3f876fe
Fixed #29525 Explorer: show "Folders" as title when in multi root
foreverest 92681cb
emmet.excludeLang shouldnt need reload. Fixes #29680
ramya-rao-a a5ce4b6
Removing emmet.variables that arent used by emmet snippets
ramya-rao-a 96643e3
ensure we use version 2.3.4 for building
kieferrm d88db2c
Fix #29601 - exclude settings not correctly applied on windows
roblourens c04250a
Trim C:/ correctly
roblourens 32c40e4
add hashed remotes
kieferrm a945a56
Add tests for getAbsoluteGlob
roblourens 1c8b38e
reenable command: links in hovers; fixes #29076
kieferrm a4525f5
Fix win test
roblourens 4d97535
Merge branch 'roblou/fixWindowsMultirootSearc'
roblourens bf2bee9
adopt official release of TS 2.4.1
kieferrm 04a1b72
Fix #29538 - update search viewlet with excludes from first open root…
roblourens b69887c
Use emmet.includeLanguages to enable emmet abbr in non supported lang…
ramya-rao-a 63def6e
Support both syntaxProfiles and includeLanguages until #29678 is reso…
ramya-rao-a d50aae1
introduce and use ResourceGlobMatcher
bpasero 3e4a7d1
fix imports
bpasero 1401409
Decide on multi root actions naming (fixes #29434)
bpasero 38b523c
Configure git for testuser, rather then for root.
michelkaporin b6faabe
Support group and presentation in global schema
dbaeumer fa89751
Fixes #29721: Rename Global Task menu to Tasks
dbaeumer 8a31406
remove outdated debugService.enabled
isidorn c1d6122
onDidTerminateDebugSession do not fire when debug session doesn't sta…
isidorn 208f3ae
Trying to fix #29731
michelkaporin 741f961
Fixes #29732: Make default group entry more usable
dbaeumer 9081bf6
fix compile errors
isidorn 8c77107
Merge pull request #29596 from foreverest/multiRootName
isidorn 15bf0c6
Allow 3 trials to wait until editor is drawn.
michelkaporin 3d0bdea
Fixes #29599: Have the close diff review pane button respect the dark…
alexdima fd2173a
fixes #29728
joaomoreno d30c831
node-debug@1.14.8
weinand 1888ad8
use final DAP 1.21.0
weinand 5c85e34
fixes #29581
joaomoreno e1b9a2f
simplify explorer title setting
isidorn d6c439a
"Add root folder" on windows adds "file:///c%3a/Users/..." (fixes #29…
bpasero 19decf7
Add insertSpaceAfterTypeAssertion formatting option
mjbvz 3a76e48
:lipstick:
bpasero 1add158
don't freeze suggestions when not on a word anymore, #29353
jrieken ddafd22
add arch to telemetry, #507
jrieken b294944
Fixes #29326: Avoid flickering by respecting the previous frame layou…
alexdima 471ef70
Fix paste across folders
isidorn a48e068
Fixes #29610: Improve presentation of problem matcher picker
dbaeumer e23d2b6
Improve wording
dbaeumer c65f550
fix tests
isidorn dda321e
Rename customize -> configured
dbaeumer 4fdbc6c
disable "copy" for roots
isidorn 0626287
only ignore whitespace a completion selects, not whitespace users typ…
jrieken b40aaf4
Fixes #29742: Add telemetry event for task customization
dbaeumer 5ad1618
with incomplete suggest results, only re-trigger when still typing a …
jrieken 5582a20
fix Select for Compare action
isidorn 5f443db
debugHover: fix scroll for complex hover
isidorn bf5b1db
Document current keybinding behaviour for TCIM.Zhuyin (#28237)
alexdima 53e3e9e
Fixes #28237: Identify keyboard layouts where A-Z are missing or unus…
alexdima 69e9593
Fix #29633
sandy081 fee4d54
fixes #23774
joaomoreno c9b1c66
fix tree multi root expansion
isidorn fcd9a89
Merge branch 'master' of github.com:Microsoft/vscode
joaomoreno 60efdae
fixes #27595
joaomoreno ab3c945
Import 'nls' in extensions entry point. Fixes #29098.
michelkaporin 1bd9439
Fix #29756
sandy081 b9a348e
Fixes #29761: Use picker instead of quick pick to select a build or t…
dbaeumer 12ea528
Correctly configuring nls for use. #29098
michelkaporin 6a26abf
add telemetry for new multiroot workspace API, #28526
jrieken 9959889
fixes #29547
isidorn 496e3ff
remove unnecessary code
kieferrm 93101a2
fix #29641
jrieken 308709b
Fixes Microsoft/monaco-editor#481: Have aria live work in IE and Edge…
alexdima dc99c9a
Fixes Microsoft/monaco-editor#477: Menu separators should not have a …
alexdima 8e42dc8
Fixes #29741: use signs for diff lines for Screen Readers
alexdima 81a9bb5
Fix #29609
sandy081 ff1d3c2
#29609 Check for split view existence
sandy081 4a411dc
#29756 Much cleaner fix
sandy081 bacc894
fix compile errors
bpasero 7c871fa
remove extra console.log
bpasero 3d0a664
add jsdoc comments, #29759
jrieken f2a5365
Switch to scheme blacklist for links in markedstring
mjbvz dcdd24d
node-debug2@1.14.4
roblourens f317513
fixes #29537
joaomoreno e692fc7
Retain suggest docs stickyness with new editors
ramya-rao-a 7ba1dcf
Emmet suggestions in non markup/stylesheet languages #29532
ramya-rao-a 9ac6c54
Support space after comma in links like '[x, y]'
Tyriar 082ccc4
Focus terminal after closing find widget with mouse
Tyriar 04f25df
Emmet suggestions for jsx only when expicitly asked for #29532
ramya-rao-a 2f77f9f
Stop supporting both syntaxProfiles, includeLanguage settings in new …
ramya-rao-a ff6b72f
updating distro
kieferrm e3673c6
Support multiCursorModifier in terminal
Tyriar 2d0cf23
Have terminal use editor's hover widget styles
Tyriar a370420
Use proper path equal or parent check in file watcher
Tyriar 98f7673
Uplevel xterm.js
Tyriar 9cb698b
Update comments
ramya-rao-a e2a18e4
Fixes #29802 Corner cases of Select next/prev item feature
ramya-rao-a 886f472
Fix #29753. Ignore comments area when reindenting and honor onEnter r…
rebornix 15ccb8d
Fix #29664, Fix #29668. Add JSON indentation rules.
rebornix 9fa2a25
Fix #29725. Add indentation rules for CSS.
rebornix 280ea0b
Fix infinite loop when node doesnt have non comment children. #27763
ramya-rao-a bca6c99
Fix #29799. Fix typo for autoIndent description.
rebornix 5afaf1d
Robustness towards invalid URIs
chrmarti 23ac6d4
Fix nsfw tests on windows
roblourens 91e83d4
Fallback to warn on label
chrmarti 9d46f70
Fix #29755. Adjust cursor position when pressing enter inside leading…
rebornix b405e7c
put cache of old selection at top
rebornix e99bdad
Revisit #29457. Auto select one more character if the selected whites…
rebornix d1f8686
Reactivate windows nsfw tests
Tyriar 63fe7ba
Move single line does not need selection readjustment
rebornix c1b81e5
Fix #29803. Do not reindent the line if the content is pasted to the …
rebornix 26d28ca
Merge pull request #29815 from Microsoft/tyriar/fix_windows_nsfw_tests
Tyriar 9541932
Fix #29801 - glob with correct path when testing sibling exclude expr…
roblourens 4fca394
Fixes #29820: Allow users to configure the default build and test task
dbaeumer 8da5b22
I can not change the encoding of a file (fixes #29797)
bpasero a961d0a
tfs: debug linux build
joaomoreno c3ce4a5
tfs: fix linux 32
joaomoreno cc4d6a8
tfs: linux
joaomoreno a609b2f
Fixes #29561: Escape 'scanning the build ouput' quick open -> run tas…
dbaeumer 91f83af
Wait until git extension is loaded before checking for localized view…
michelkaporin 60a2c5e
debug remove counter in repl
isidorn 101ff0a
Fixes #29759: More Task API feedback
dbaeumer f1fec6b
disable unit tests for linux 32
joaomoreno db88728
more output for failing nsfw watcher
bpasero 0e39ec5
Fixes #29835: Move Task API from proposed to final.
dbaeumer a05d64d
fixes #29448
joaomoreno 6d09da4
better message for gulp watch failing with nsfw
bpasero 7b4d504
findClosest
isidorn 9e04762
fixes #29839
joaomoreno ae9a386
Fixes #29785: Task is running in terminal with "runner": "process"
dbaeumer dc3c181
fixes #29777
joaomoreno eb68244
Fixes #29400: Change menu item label for `workbench.action.toggleMult…
alexdima ca559d7
Fixes #29836: Hide the diff review pane when the diff editor gets foc…
alexdima 46ac927
Info about screenshots
michelkaporin ea8d96d
Fixes #29606: Node 7 sends ASCII control characters not handled by th…
dbaeumer 4b7c117
Small code cleanup
dbaeumer d205f20
debug: use inline decoration to remove token colors in HC theme
isidorn 4c59f44
Fixes #29593: Tasks 2.0.0: presentation is not allowed as a global pr…
dbaeumer 086f6b3
fixes #27422
joaomoreno 1c86623
fixes #29729
joaomoreno f00d4f7
Revert "fixes #29729"
joaomoreno a16f659
fixes #29729
joaomoreno 8787538
Fix for #29608 'QuickOpen looks misaligned in monokai theme'. (#29860)
brandontruggles 3585fa3
[css] update service (for #27189)
aeschli 3019249
Fixes #29863: Remove Run Test Task from the global menu until we have…
dbaeumer 173a9bf
Add documentation for proposed configuration api
sandy081 7e94116
Doc for proposed config api
sandy081 20aea5d
Fix merge issues
sandy081 8a6a895
Uplevel xterm.js
Tyriar 01cbc6d
[json] update service (for #29848)
aeschli 1b34b1d
Fix #29828, Fix #29843, Fix #29876. Enter in the middle of content sh…
rebornix 42ae1fc
Emmet html suggestions after typing : #29758
ramya-rao-a 8b4e442
Fix #29881. Null guard
rebornix 605ee59
Fix extra tabs when wrapping with inline element #27621
ramya-rao-a 8da3ea9
Use original scheme (fixes #29872)
chrmarti 771b684
Do not raw attach straight away due to wrong event ordering
isidorn 4ea63e5
Wrap partial line with abbr #29857
ramya-rao-a 229a54d
Small word smithing
dbaeumer 2f57fa7
Fix #29719 - exclude nested folders during search to not show dupes
roblourens ded0541
Mitigate #29722. No indentation change if there is no indentation rul…
rebornix 7910b3d
Fix js/ts decrease indentation for block comments inside brackets
mjbvz e7de8b2
More trigger chars #29758
ramya-rao-a 0ee00cb
Emmet Error handling Fixes #29897
ramya-rao-a d66d673
Removing dead code
ramya-rao-a 7e29372
Use new emmet commands only when useNewEmmet is true
ramya-rao-a e3c3d7c
Merge pull request #29859 from Microsoft/update-notification
joaomoreno 541b61b
fixes #29624
joaomoreno 733e64b
[css] update service (for #27189)
aeschli ac2d070
Fixes #29868 & #29865
dbaeumer db5e65b
Fix #29760
sandy081 8b6ba66
Switched to HTTPS requests for Transifex. Added check for empty keys …
michelkaporin 14ae6bb
2017-06-30. Merged in translations from Transifex.
michelkaporin 885c30a
Fixes #29922: Starting Debug with a preLauch task referenced from an …
dbaeumer db3ac35
Await wait
michelkaporin a7b27bb
Added step to run npm install
egamma 9b0ba2f
Fixes #29940
michelkaporin 4861494
Update README.md
michelkaporin 6dc5253
Update README.md
michelkaporin 3494634
Always split quick links
chrmarti 158270d
Updated setting value to be more intutive
ramya-rao-a 3f8bd16
update dependency on vscode-extension-telemetry
kieferrm 0edc80d
add shrinkwrap file for merge-conflict
kieferrm 610a6f9
Fix doc comment spelling errors in problemMatcher.ts
dlech b258f0d
Fix #29958 - builtin PHP extension fails to activate
roblourens c3643f0
Updating version to absorb the change in url
ramya-rao-a fb52a0e
remove dev dependencies from shrinkwrap
kieferrm 7cd1753
Updated comments on emmet settings
ramya-rao-a 04db7c3
Remove devDependencies from npm-shrinkwrap
roblourens b36b00f
Updated comments on the new emmet settings
ramya-rao-a f49482b
Update ThirdPartyNotices.txt
roblourens bd742fc
disable emmet 2.0 for stable; fixes #29908
kieferrm 854c69a
disable autoIndent for stable
kieferrm 3075108
re-enable autoIndent
kieferrm 782533e
re-enable emmet 2.0
kieferrm 19961c2
Indent cases should specify autoIndent option
rebornix bf303b9
Update "distro" key
roblourens 222ed5b
Reset JavaScript expression coloring in template expressions (#29966)
mjbvz 478365b
Uplevel xterm.js
Tyriar a93c51a
classifier: andre for debug issues
isidorn bbfcefb
Integrate smoketest-express project tasks 2.0 changes.
michelkaporin bf939ff
debug: only check id when launching preLaunchTask
isidorn 794b4ee
debug: fix wording
isidorn ccda5dc
tfs: debug linux unix tests
joaomoreno 1452fb9
Merge pull request #29963 from dlech/patch-4
dbaeumer 33e251c
bump to 1.15.0
bpasero a76af8a
TypeError: expressionForRoot is not a function (fixes #30034)
bpasero 933e0c0
"Deleted from disk" indicator is removed once any new file event kick…
bpasero f0f6038
simplify unnecessary Math.min (#29902)
nicksnyder 8903b77
update linux build agent
joaomoreno a6a0d8c
disable xvfb-run
joaomoreno c2fa7f6
tfs: linux, remove xvfb-run support
joaomoreno b31643d
Merge branch 'linux-unit-tests'
joaomoreno 073d279
Merge branch 'master' into proxy-auth
joaomoreno a4667bf
Merge pull request #22369 from joaomoreno/proxy-auth
joaomoreno 0ba14ef
Merge with upstream master
codeguy bbcd286
First tests, cannot fetch stdout of spawned validator process
codeguy deff488
Remove custom stdio array from test code
nmcjosh dd3a219
Add child process callback to report exit code, signal
nmcjosh 7720319
Progress after inspecting stderr
nmcjosh 63326e0
More progress, paths being auto converted back to C: style?
nmcjosh e777481
WOOOOOO VICTORY
nmcjosh a24f508
Re-enable lines that I removed earlier
nmcjosh fbf8e63
Hook up php shell validate settings
nmcjosh 2af116f
Standardize PHP validator settings
codeguy 14f7c48
Let shellExecutable respect current platform
codeguy 54d2f92
Update PHP validator NLS labels
codeguy fa405c6
Use ComSpec
codeguy 48e3d15
Fix merge conflicts
codeguy a3cfa60
Fix msys assignment in func scope
codeguy 9676d00
Fix cmd and powershell shell args
codeguy File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -12,6 +12,7 @@ import * as vscode from 'vscode'; | |
import { ThrottledDelayer } from './utils/async'; | ||
|
||
import * as nls from 'vscode-nls'; | ||
|
||
let localize = nls.loadMessageBundle(); | ||
|
||
export class LineDecoder { | ||
|
@@ -97,15 +98,17 @@ export default class PHPValidationProvider { | |
private diagnosticCollection: vscode.DiagnosticCollection; | ||
private delayers: { [key: string]: ThrottledDelayer<void> }; | ||
|
||
private platform: string; | ||
private runInShell: boolean = false; | ||
private shellExecutable: string = 'C:\\Windows\\sysnative\\bash.exe'; | ||
private shellExecutable: string; | ||
private shellArgs: string[] = ['-c']; | ||
|
||
constructor(private workspaceStore: vscode.Memento) { | ||
this.executable = null; | ||
this.validationEnabled = true; | ||
this.trigger = RunTrigger.onSave; | ||
this.pauseValidation = false; | ||
this.platform = process.platform; | ||
} | ||
|
||
public activate(subscriptions: vscode.Disposable[]) { | ||
|
@@ -147,6 +150,11 @@ export default class PHPValidationProvider { | |
let shellSettings = section.get<any>('validate.runInShell'); | ||
if (typeof(shellSettings) === 'boolean') { | ||
this.runInShell = shellSettings; | ||
if (this.platform.toLowerCase() === 'win32') { | ||
this.shellExecutable = 'C:\\Windows\\sysnative\\bash.exe'; | ||
} else { | ||
this.shellExecutable = process.env.SHELL || '/bin/bash'; | ||
} | ||
} else if (typeof(shellSettings) === 'object') { | ||
this.runInShell = true; | ||
if (shellSettings.shellExecutable && typeof(shellSettings.shellExecutable) === 'string') { | ||
|
@@ -277,10 +285,12 @@ export default class PHPValidationProvider { | |
// Shell args | ||
let executableArgs = args.slice(0); | ||
|
||
// Transform Windows file path to Linux file path | ||
let windowsPath = executableArgs.pop(); | ||
let linuxPath = windowsPath.trim().replace(/^([a-zA-Z]):\\/, '/mnt/$1/').replace(/\\/g, '/'); | ||
executableArgs.push(linuxPath); | ||
// If win32 and bash.exe, transform Windows file path to Linux file path | ||
if (this.platform === 'win32' && executable.indexOf('bash.exe') !== -1) { | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. We can't simply test bash.exe here since git under Window installs a bash.exe as well. We either need to test for the full path or better see how bash from git mount the drive and do the path magic as well. |
||
let windowsPath = executableArgs.pop(); | ||
let linuxPath = windowsPath.trim().replace(/^([a-zA-Z]):\\/, '/mnt/$1/').replace(/\\/g, '/'); | ||
executableArgs.push(linuxPath); | ||
} | ||
|
||
// Finalize executable args | ||
args = this.shellArgs.concat(['"', executableInShell, executableArgs.join(' '), '"']); | ||
|
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think we can't assume that a user wants the bash if runInShell is set to true. I would expect that the user wants to use what is defined in ComSpec under Windows.
And then we need to set the shellArgs accordingly as well since -c will not work with cmd.exe nor with powershell.exe. For cmd.exe this is /C and for PowerShell it is /Command