-
Notifications
You must be signed in to change notification settings - Fork 840
[RFC FS-1001] String Interpolation #8907
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
Merged
Merged
Changes from 1 commit
Commits
Show all changes
195 commits
Select commit
Hold shift + click to select a range
1ba6b74
string interploation implementation
dsyme 23d38cc
string interploation tests
dsyme 2593c76
Merge branch 'master' of https://github.com/dotnet/fsharp into featur…
dsyme cf658de
escape {{ }}, test verbatim and triple quote, implement .NET specifiers
dsyme 6a9128b
fix tests
dsyme 047fda6
string interpolation tests: internal representation corner cases
b31c14f
string-interp tests should have --langversion:preview
484e46c
string interop tests: sprintf
d475013
string interp tests: format specifier negative cases
e1f416f
string interp tests: format specifier negative cases, .NET-style padding
465594f
Merge pull request #8959 from dotnet/merges/master-to-feature/string-…
KevinRansom e0c50e8
Merge pull request #8979 from dotnet/merges/master-to-feature/string-…
KevinRansom d23441e
Merge pull request #8992 from dotnet/merges/master-to-feature/string-…
KevinRansom bc1b156
Merge branch 'feature/string-interp' of http://github.com/dotnet/fsha…
b17c3ed
fix nested interp strings
e5d3a2c
style cleanup
1072e51
lex: unify string interp stack and counter
3c19e22
string-interp: add test cases
ddaf4b2
fix mixed quote nested string interpolation
7677c99
string-interp: add test case for multiple interpolation points with d…
7a4d707
lexfilter: push new CtxtParen at endPos for INTERP_STRING_PART and IN…
6f6a6b3
lexfilter: do not check undentation limit for string interpolation to…
8207035
Merge pull request #9003 from dotnet/merges/master-to-feature/string-…
KevinRansom 357d92c
Merge pull request #8997 from yatli/feature/string-interp-nested
dsyme 4cb847f
Merge branch 'master' of https://github.com/dotnet/fsharp into featur…
dsyme f36d255
Merge branch 'feature/string-interp' of https://github.com/dotnet/fsh…
dsyme 2b242db
FormattableString prototype
dsyme 1e2b377
Merge branch 'master' of https://github.com/dotnet/fsharp into featur…
dsyme 69ae733
add FormattableString support
dsyme d7388cc
negative error checking
dsyme b2d1cc9
remove diagnostics
dsyme ad2e050
simpler FormattableString implementation
dsyme 279c05d
fix test
dsyme 500ecf7
add testing for nested
dsyme 9bf95ab
add IFormattable support
dsyme 47b61ec
tweak error message
dsyme 7306572
Merge remote-tracking branch 'upstream/feature/string-interp' into fe…
455b568
tests: StringInterpolation: fix case errors
7b79c98
fix error message
dsyme ca838cb
Merge branch 'master' of https://github.com/dotnet/fsharp into featur…
dsyme 39070da
check number of values matches
dsyme 842ae0a
Merge remote-tracking branch 'upstream/feature/string-interp' into fe…
5f0e16d
Merge pull request #9045 from dotnet/merges/master-to-feature/string-…
KevinRansom dcab1d6
Merge branch 'master' of https://github.com/dotnet/fsharp into featur…
dsyme 50c7d70
Merge pull request #9058 from dotnet/merges/master-to-feature/string-…
KevinRansom 45501bf
Merge branch 'feature/string-interp' into merges/master-to-feature/st…
KevinRansom 85e8b16
Merge pull request #9074 from dotnet/merges/master-to-feature/string-…
KevinRansom bd9ccf9
Merge pull request #9084 from dotnet/merges/master-to-feature/string-…
KevinRansom d12456b
Merge pull request #9090 from dotnet/merges/master-to-feature/string-…
KevinRansom 373ccf3
allow use of format strings with printf and friends
dsyme eb30ac3
Merge branch 'feature/string-interp' of https://github.com/dotnet/fsh…
dsyme f9684c9
update baselines
dsyme 8e10cd9
fix baselines
dsyme 6d9a1ac
add Experimental attributes
dsyme 49eb291
update string interp negative tests
086c0d9
Merge remote-tracking branch 'upstream/feature/string-interp' into fe…
49ba592
stringinterp test: add PrintFormat tests
7f39617
printf: fix empty interpolation string evaluates to null in printf env
5f01922
enable test corectly
dsyme 66a1c35
Revert "printf: fix empty interpolation string evaluates to null in p…
3ddb5f4
Merge pull request #8966 from yatli/feature/string-interp
dsyme ba0e2ce
simplify codegen for interpolated strings
dsyme b3b9438
Merge branch 'feature/string-interp' of https://github.com/dotnet/fsh…
dsyme 21f4c7a
Merge pull request #9098 from dotnet/merges/master-to-feature/string-…
KevinRansom 7d66fa8
Merge pull request #9131 from dotnet/merges/master-to-feature/string-…
KevinRansom 901bf8e
Merge branch 'master' of https://github.com/dotnet/fsharp into featur…
dsyme c47df89
Merge pull request #9160 from dotnet/merges/master-to-feature/string-…
KevinRansom dde09f8
Merge pull request #9173 from dotnet/merges/master-to-feature/string-…
KevinRansom 40f863e
Merge pull request #9182 from dotnet/merges/master-to-feature/string-…
KevinRansom c3039cc
Merge pull request #9191 from dotnet/merges/master-to-feature/string-…
KevinRansom 3945571
Merge pull request #9196 from dotnet/merges/master-to-feature/string-…
KevinRansom 49da374
Merge pull request #9204 from dotnet/merges/master-to-feature/string-…
KevinRansom bc755cb
Merge pull request #9210 from dotnet/merges/master-to-feature/string-…
KevinRansom 3cdec16
Merge pull request #9214 from dotnet/merges/master-to-feature/string-…
KevinRansom 01be506
Merge branch 'feature/string-interp' into merges/master-to-feature/st…
KevinRansom f42cbce
Merge branch 'master' into feature/string-interp
dsyme 24b3ad6
Merge pull request #9239 from dotnet/merges/master-to-feature/string-…
KevinRansom bfbd6af
Merge pull request #9278 from dotnet/merges/master-to-feature/string-…
KevinRansom ab229df
Merge pull request #9288 from dotnet/merges/master-to-feature/string-…
KevinRansom 980e0d3
Merge pull request #9307 from dotnet/merges/master-to-feature/string-…
KevinRansom 8158ca9
Merge pull request #9312 from dotnet/merges/master-to-feature/string-…
KevinRansom bb9695b
Merge pull request #9321 from dotnet/merges/master-to-feature/string-…
KevinRansom 6f1e6ed
Merge pull request #9327 from dotnet/merges/master-to-feature/string-…
KevinRansom 553e62a
Merge pull request #9332 from dotnet/merges/master-to-feature/string-…
KevinRansom 8455ce6
Merge pull request #9345 from dotnet/merges/master-to-feature/string-…
KevinRansom 5a5fd03
Merge pull request #9354 from dotnet/merges/master-to-feature/string-…
KevinRansom 58a71a5
integrate master
dsyme bf29c6e
fix build
dsyme ea9b483
Merge pull request #9441 from dotnet/merges/master-to-feature/string-…
KevinRansom a4957c7
Merge pull request #9453 from dotnet/merges/master-to-feature/string-…
KevinRansom ccc186b
Merge branch 'master' of https://github.com/dotnet/fsharp into featur…
dsyme 909e8b9
Merge pull request #9467 from dotnet/merges/master-to-feature/string-…
KevinRansom fe5f2a2
fix build
dsyme 1f463ad
Merge branch 'feature/string-interp' of https://github.com/dotnet/fsh…
dsyme f170f5c
Merge pull request #9478 from dotnet/merges/master-to-feature/string-…
KevinRansom ec9b805
Merge pull request #9488 from dotnet/merges/master-to-feature/string-…
KevinRansom 093f3d0
Merge pull request #9494 from dotnet/merges/master-to-feature/string-…
KevinRansom 82c16b2
Merge pull request #9505 from dotnet/merges/master-to-feature/string-…
KevinRansom b66c67b
Merge pull request #9530 from dotnet/merges/master-to-feature/string-…
KevinRansom 517f5d4
Merge pull request #9537 from dotnet/merges/master-to-feature/string-…
KevinRansom 34291d3
Merge branch 'feature/string-interp' into merges/master-to-feature/st…
KevinRansom c3f40ff
Merge branch 'master' into feature/string-interp
KevinRansom 6ad30ef
Merge pull request #9545 from dotnet/merges/master-to-feature/string-…
KevinRansom 72c1b81
Merge pull request #9551 from dotnet/merges/master-to-feature/string-…
KevinRansom 9496c75
Merge branch 'feature/string-interp' into merges/master-to-feature/st…
KevinRansom e3f0266
Merge pull request #9560 from dotnet/merges/master-to-feature/string-…
KevinRansom 0bcce18
Merge pull request #9564 from dotnet/merges/master-to-feature/string-…
KevinRansom 926651b
Merge pull request #9569 from dotnet/merges/master-to-feature/string-…
KevinRansom 098ae6c
Merge pull request #9573 from dotnet/merges/master-to-feature/string-…
KevinRansom e04ac6d
Merge master to feature/string-interp (#9580)
dotnet-bot 7835fb4
Merge pull request #9585 from dotnet/merges/master-to-feature/string-…
KevinRansom 0bfde32
Re enable tests for operators: OperatorsModule1.fs and OperatorsModul…
dotnet-bot 99d8356
Merge pull request #9592 from dotnet/merges/master-to-feature/string-…
KevinRansom 504d537
Moved fsharpqa/Libraries/Core/Unchecked test cases to NUnit (#9576) (…
dotnet-bot edd276c
Moved fsharpqa/Libraries/Core/Unchecked test cases to NUnit (#9576) (…
dotnet-bot 5e3a85c
Merge master to feature/string-interp (#9615)
dotnet-bot 9731382
Merge master to feature/string-interp (#9619)
dotnet-bot 1c9852f
Merge pull request #9624 from dotnet/merges/master-to-feature/string-…
KevinRansom 92b619e
merge
KevinRansom 068198f
Text tweeks
KevinRansom ad81cdc
Merge pull request #9636 from dotnet/merges/master-to-feature/string-…
KevinRansom 7108b5b
don't auto-resolve types from System.Runtime.WindowsRuntime (#9644) (…
dotnet-bot 85eb5ee
Merge pull request #9651 from dotnet/merges/master-to-feature/string-…
KevinRansom c032ce1
yeet (#9657) (#9661)
dotnet-bot da3cba5
yeet (#9657) (#9670)
dotnet-bot 60ec1cc
Merge pull request #9676 from dotnet/merges/master-to-feature/string-…
KevinRansom 15c39f5
Merge pull request #9681 from dotnet/merges/master-to-feature/string-…
KevinRansom ffb29a9
Merge pull request #9689 from dotnet/merges/master-to-feature/string-…
KevinRansom 241204e
Merge branch 'master' of https://github.com/dotnet/fsharp into featur…
dsyme 597c654
Merge pull request #9700 from dotnet/merges/master-to-feature/string-…
KevinRansom d1b2cb0
Merge pull request #9709 from dotnet/merges/master-to-feature/string-…
KevinRansom be2bb89
Merge pull request #9725 from dotnet/merges/master-to-feature/string-…
KevinRansom 8433a0c
Merge branch 'feature/string-interp' into merges/master-to-feature/st…
KevinRansom 7990667
Merge pull request #9731 from dotnet/merges/master-to-feature/string-…
KevinRansom aed1db7
auto merge
dsyme cb608ae
fix up tokenizer tests
dsyme 11b719f
integrate
dsyme d98ae40
fix code review things
dsyme fa821ab
fix code review things
dsyme 9db99f9
fix code review things
dsyme a4fee1d
fix code review things
dsyme e2f80b3
add various testing
dsyme 0f61536
correct continuations for interpolated strings
dsyme fbde331
fix lexer continuations and colorization for multi-line interpolated …
dsyme c65203f
Merge branch 'master' of https://github.com/dotnet/fsharp into featur…
dsyme b6a2ede
revert xlf changes
dsyme 110876d
fix assert
dsyme e7cdb8b
Merge branch 'master' of https://github.com/dotnet/fsharp into featur…
dsyme 07394d3
completion and brace matching (not all tests passing yet)
dsyme 458a5e6
Fix rebuild
KevinRansom cf2d420
Merge branch 'FixBuild' of https://github.com/KevinRansom/fsharp into…
dsyme 646fc94
fix various niggles and get tests working
dsyme 32da3a1
fix printf when '%a' in final position
dsyme 6514788
fix test case
dsyme e758b4b
interpolated string specifer highlighting
dsyme 5fba578
fix triple quote interpolated string specifer highlighting
dsyme 56f3632
fix triple quote interpolated string specifer highlighting
dsyme 68df7db
fix build
dsyme f53a18b
fix missing error message
dsyme f726bb5
Merge pull request #9775 from dotnet/merges/master-to-feature/string-…
KevinRansom e3d1a74
fix % specifiers for interpolated strings
dsyme 4b898cf
fix % specifiers for interpolated strings
dsyme fbb3251
Merge branch 'feature/string-interp' of https://github.com/dotnet/fsh…
dsyme 22535de
fix FCS tests
dsyme 25b9662
Merge pull request #9783 from dotnet/merges/master-to-feature/string-…
KevinRansom 90e7ac7
Merge pull request #9791 from dotnet/merges/master-to-feature/string-…
KevinRansom 9668a67
Merge pull request #9794 from dotnet/merges/master-to-feature/string-…
cartermp f32e77f
minor nits from code review
dsyme c2430dc
Merge branch 'feature/string-interp' of https://github.com/dotnet/fsh…
dsyme b0c012f
Merge pull request #9804 from dotnet/merges/master-to-feature/string-…
cartermp 51dd50f
Merge pull request #9811 from dotnet/merges/master-to-feature/string-…
cartermp f002be9
code review feedback and use struct tuples in more places
dsyme 6e99014
revert struct tuples
dsyme e864cc7
use struct tuples where possible, byrefs for index
dsyme f834f7e
fix byref for index
dsyme bda29f6
fix ksprintf block size
dsyme cbd33aa
make recent cache entry more explicit (cleanup)
dsyme b827b10
improve performance
dsyme f2832d3
remove unused code
dsyme 4e51a9b
Merge pull request #9819 from dotnet/merges/master-to-feature/string-…
cartermp a811af3
Merge pull request #9822 from dotnet/merges/master-to-feature/string-…
KevinRansom 071f075
Merge pull request #9832 from dotnet/merges/master-to-feature/string-…
KevinRansom d9ba442
Merge branch 'feature/string-interp' into merges/master-to-feature/st…
KevinRansom aaf7faa
Merge pull request #9835 from dotnet/merges/master-to-feature/string-…
KevinRansom d8bb2ff
Merge pull request #9843 from dotnet/merges/master-to-feature/string-…
KevinRansom bc6ea74
Move existing Compiler.ComponentTests to a new Compiler.fs framework …
dotnet-bot 0a88a66
Move existing Compiler.ComponentTests to a new Compiler.fs framework …
vzarytovskii b6fbc74
Merge pull request #9851 from dotnet/merges/master-to-feature/string-…
KevinRansom 93a1a0d
Merge pull request #9856 from dotnet/merges/master-to-feature/string-…
KevinRansom 6af4caf
Merge branch 'master' into feature/string-interp
dsyme 3a4066c
Merge pull request #9884 from dotnet/merges/master-to-feature/string-…
KevinRansom d27379f
Merge pull request #9889 from dotnet/merges/master-to-feature/string-…
cartermp 83e63a6
merge
KevinRansom 60db04e
fix https://github.com/dotnet/fsharp/issues/9893
dsyme ba48b59
fix unmantched right brace in interp string
dsyme 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
Revert "printf: fix empty interpolation string evaluates to null in p…
…rintf env" This reverts commit 7f39617.
- Loading branch information
There are no files selected for viewing
This file contains hidden or 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
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.
Uh oh!
There was an error while loading. Please reload this page.