Skip to content

Unignore files for formatting (.fantomasignore) if the underlying Fantomas issue has been resolved #14960

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 6 commits into from
Apr 6, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 0 additions & 8 deletions .fantomasignore
Original file line number Diff line number Diff line change
Expand Up @@ -107,9 +107,6 @@ src/FSharp.Core/printf.fs
src/FSharp.Core/Query.fs
src/FSharp.Core/seqcore.fs

# Fantomas limitation https://github.com/fsprojects/fantomas/issues/2264

src/FSharp.Core/SI.fs

# Fantomas limitations on implementation files (to investigate)

Expand Down Expand Up @@ -139,8 +136,3 @@ src/FSharp.Core/Query.fsi
src/FSharp.Core/resumable.fsi
src/FSharp.Core/async.fsi

# Fantomas limitations on signature files in FSharp.Core (https://github.com/fsprojects/fantomas/issues/2230)

src/FSharp.Core/array.fsi
src/FSharp.Core/tasks.fsi
src/FSharp.Core/seq.fsi
60 changes: 30 additions & 30 deletions src/FSharp.Core/SI.fs
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@ open Microsoft.FSharp.Core

/// The SI unit of length
[<Measure>]
type metre
type metre

/// The SI unit of length
[<Measure>]
type meter = metre
type meter = metre

/// The SI unit of mass
[<Measure>]
Expand All @@ -23,27 +23,27 @@ type second

/// The SI unit of electric current
[<Measure>]
type ampere
type ampere

/// The SI unit of thermodynamic temperature
[<Measure>]
type kelvin
type kelvin

/// The SI unit of amount of substance
[<Measure>]
type mole

/// The SI unit of luminous intensity
[<Measure>]
type candela
type candela

/// The SI unit of frequency
[<Measure>]
type hertz = / second

/// The SI unit of force
[<Measure>]
type newton = kilogram metre / second^2
type newton = kilogram metre / second^2

/// The SI unit of pressure, stress
[<Measure>]
Expand All @@ -55,63 +55,63 @@ type joule = newton metre

/// The SI unit of power, radiant flux
[<Measure>]
type watt = joule / second
type watt = joule / second

/// The SI unit of electric charge, amount of electricity
[<Measure>]
type coulomb = second ampere
type coulomb = second ampere

/// The SI unit of electric potential difference, electromotive force
[<Measure>]
type volt = watt/ampere
type volt = watt / ampere

/// The SI unit of capacitance
[<Measure>]
type farad = coulomb/volt
type farad = coulomb / volt

/// The SI unit of electric resistance
[<Measure>]
type ohm = volt/ampere
type ohm = volt / ampere

/// The SI unit of electric conductance
[<Measure>]
type siemens = ampere/volt
type siemens = ampere / volt

/// The SI unit of magnetic flux
[<Measure>]
type weber = volt second
type weber = volt second

/// The SI unit of magnetic flux density
[<Measure>]
type tesla = weber/metre^2
type tesla = weber / metre^2

/// The SI unit of inductance
[<Measure>]
type henry = weber/ampere
type henry = weber / ampere

/// The SI unit of luminous flux
[<Measure>]
type lumen = candela
type lumen = candela

/// The SI unit of illuminance
[<Measure>]
type lux = lumen/metre^2
type lux = lumen / metre^2

/// The SI unit of activity referred to a radionuclide
[<Measure>]
type becquerel = second^-1
type becquerel = second^-1

/// The SI unit of absorbed dose
[<Measure>]
type gray = joule/kilogram
type gray = joule / kilogram

/// The SI unit of does equivalent
[<Measure>]
type sievert = joule/kilogram
type sievert = joule / kilogram

/// The SI unit of catalytic activity
[<Measure>]
type katal = mole/second
type katal = mole / second

// Common abbreviations for the International System of Units (SI)
namespace Microsoft.FSharp.Data.UnitSystems.SI.UnitSymbols
Expand All @@ -121,7 +121,7 @@ open Microsoft.FSharp.Data.UnitSystems.SI.UnitNames

/// A synonym for Metre, the SI unit of length
[<Measure>]
type m = metre
type m = metre

/// A synonym for kilogram, the SI unit of mass
[<Measure>]
Expand All @@ -133,19 +133,19 @@ type s = second

/// A synonym for ampere, the SI unit of electric current
[<Measure>]
type A = ampere
type A = ampere

/// A synonym for kelvin, the SI unit of thermodynamic temperature
[<Measure>]
type K = kelvin
type K = kelvin

/// A synonym for mole, the SI unit of amount of substance
[<Measure>]
type mol = mole
type mol = mole

/// A synonym for candela, the SI unit of luminous intensity
[<Measure>]
type cd = candela
type cd = candela

/// A synonym for hertz, the SI unit of frequency
[<Measure>]
Expand All @@ -165,11 +165,11 @@ type J = joule

/// A synonym for watt, the SI unit of power, radiant flux
[<Measure>]
type W = watt
type W = watt

/// A synonym for coulomb, the SI unit of electric charge, amount of electricity
[<Measure>]
type C = coulomb
type C = coulomb

/// A synonym for volt, the SI unit of electric potential difference, electromotive force
[<Measure>]
Expand All @@ -181,11 +181,11 @@ type F = farad

/// A synonym for siemens, the SI unit of electric conductance
[<Measure>]
type S = siemens
type S = siemens

/// A synonym for UnitNames.ohm, the SI unit of electric resistance.
[<Measure>]
type ohm = Microsoft.FSharp.Data.UnitSystems.SI.UnitNames.ohm
type ohm = Microsoft.FSharp.Data.UnitSystems.SI.UnitNames.ohm

/// A synonym for weber, the SI unit of magnetic flux
[<Measure>]
Expand Down
Loading