diff --git a/build/config/AssemblySignToolData.json b/build/config/AssemblySignToolData.json index 55d61478581..79eaf9f3355 100644 --- a/build/config/AssemblySignToolData.json +++ b/build/config/AssemblySignToolData.json @@ -39,7 +39,7 @@ "certificate": "VsixSHA2", "strongName": null, "values": [ - "bin\\VisualFSharpFull\\*\\*VisualFSharpFull.vsix", + "bin\\VisualFSharpFull\\*\\*\\VisualFSharpFull.vsix", "bin\\VisualFSharpTemplates\\*\\*\\VisualFSharpTemplate.vsix", "VSSetup\\*\\Insertion\\Microsoft.FSharp.Dependencies.vsix", "VSSetup\\*\\Insertion\\Microsoft.FSharp.VSIX.Full.Resources.*.vsix" @@ -49,8 +49,7 @@ "certificate": "NuGet", "strongName": null, "values": [ - "artifacts\\*.nupkg", - "artifacts\\*\\*.nupkg" + "packages\\*\\*.nupkg" ] } ], diff --git a/build/targets/AssemblyVersions.props b/build/targets/AssemblyVersions.props index 7bcf65a261d..b885bc070eb 100644 --- a/build/targets/AssemblyVersions.props +++ b/build/targets/AssemblyVersions.props @@ -23,15 +23,15 @@ 4.6 $(FSLanguageVersion) - $(FSCoreMajorVersion).1 + $(FSCoreMajorVersion).2 $(FSCoreMajorVersion).0.0 10.4 - $(FSPackageMajorVersion).1 + $(FSPackageMajorVersion).2 $(FSPackageMajorVersion).0.0 16 - 1 + 0 $(VSMajorVersion).0 $(VSMajorVersion).$(VSMinorVersion).0.0 diff --git a/build/targets/NGenOrCrossGen.targets b/build/targets/NGenOrCrossGen.targets index 33dcaa3a63a..3dba4fc5b2d 100644 --- a/build/targets/NGenOrCrossGen.targets +++ b/build/targets/NGenOrCrossGen.targets @@ -16,9 +16,9 @@ NGen for both 32 and 64 bit product. If compiling use the app config file, if present. --> - + - + diff --git a/fsharp.proj b/fsharp.proj index 13925ad0792..86001c3568e 100644 --- a/fsharp.proj +++ b/fsharp.proj @@ -28,7 +28,6 @@ true true true - true true true @@ -91,10 +90,11 @@ - + + - + @@ -111,7 +111,7 @@ - + @@ -155,21 +155,25 @@ - + - + + - + + + + - + - + diff --git a/setup/Swix/Microsoft.FSharp.vsmanproj b/setup/Swix/Microsoft.FSharp.vsmanproj index 6e6f7d4e7e9..8780e94b2b5 100644 --- a/setup/Swix/Microsoft.FSharp.vsmanproj +++ b/setup/Swix/Microsoft.FSharp.vsmanproj @@ -12,10 +12,10 @@ - - - - + + + + diff --git a/setup/fsharp-setup-build.csproj b/setup/fsharp-setup-build.csproj index 7968f56c51b..074879dc20e 100644 --- a/setup/fsharp-setup-build.csproj +++ b/setup/fsharp-setup-build.csproj @@ -20,15 +20,6 @@ - - - ..\vsintegration\Vsix\VisualFSharpFull\VisualFSharpFull.csproj - - - ..\vsintegration\Vsix\VisualFSharpTemplates\VisualFSharpTemplates.csproj - - - @@ -59,9 +50,6 @@ AssemblySearchPaths={HintPathFromItem};{TargetFrameworkDirectory};{RawFileName} - diff --git a/src/fsharp/FSharp.Build/Microsoft.FSharp.NetSdk.props b/src/fsharp/FSharp.Build/Microsoft.FSharp.NetSdk.props index d1f5f292644..2d07d58ce69 100644 --- a/src/fsharp/FSharp.Build/Microsoft.FSharp.NetSdk.props +++ b/src/fsharp/FSharp.Build/Microsoft.FSharp.NetSdk.props @@ -74,7 +74,7 @@ WARNING: DO NOT MODIFY this file unless you are knowledgeable about MSBuild and 4.4.0 - 4.6.1 + 4.6.2 $(DefaultValueTuplePackageVersion) $(DefaultFSharpCorePackageVersion) diff --git a/src/fsharp/FSharp.Core/FSharp.Core.nuspec b/src/fsharp/FSharp.Core/FSharp.Core.nuspec index c65dd8ffa3e..0ddd7598653 100644 --- a/src/fsharp/FSharp.Core/FSharp.Core.nuspec +++ b/src/fsharp/FSharp.Core/FSharp.Core.nuspec @@ -68,6 +68,6 @@ - + diff --git a/src/fsharp/TastOps.fs b/src/fsharp/TastOps.fs index 23242b1aff6..1c2361f711b 100644 --- a/src/fsharp/TastOps.fs +++ b/src/fsharp/TastOps.fs @@ -1773,7 +1773,8 @@ let isRefTy g ty = isFunTy g ty || isReprHiddenTy g ty || isFSharpObjModelRefTy g ty || - isUnitTy g ty + isUnitTy g ty || + (isAnonRecdTy g ty && not (isStructAnonRecdTy g ty)) ) // ECMA C# LANGUAGE SPECIFICATION, 27.2 diff --git a/src/fsharp/fsi/fsi.fsproj b/src/fsharp/fsi/fsi.fsproj index 29916135ac0..7d02c79e1d8 100644 --- a/src/fsharp/fsi/fsi.fsproj +++ b/src/fsharp/fsi/fsi.fsproj @@ -17,6 +17,7 @@ + x86 $(DefineConstants);FSI_SHADOW_COPY_REFERENCES;FSI_SERVER diff --git a/src/fsharp/fsi/xlf/FSIstrings.txt.ru.xlf b/src/fsharp/fsi/xlf/FSIstrings.txt.ru.xlf index 1b75753f2b6..0de5c8a5277 100644 --- a/src/fsharp/fsi/xlf/FSIstrings.txt.ru.xlf +++ b/src/fsharp/fsi/xlf/FSIstrings.txt.ru.xlf @@ -189,7 +189,7 @@ \n- Interrupt\n - \n- Interrupt\n + \n- Прерывать\n diff --git a/src/fsharp/pars.fsy b/src/fsharp/pars.fsy index b03987165bb..3a43237d7e4 100644 --- a/src/fsharp/pars.fsy +++ b/src/fsharp/pars.fsy @@ -3834,7 +3834,7 @@ parenExpr: | LPAREN parenExprBody ends_other_than_rparen_coming_soon_or_recover { if not $3 then reportParseErrorAt (rhs parseState 1) (FSComp.SR.parsUnmatchedParen()) - let lhsm = unionRangeWithPos (rhs parseState 1) (rhs parseState 3).Start + let lhsm = unionRangeWithPos (rhs parseState 1) (rhs parseState 2).End SynExpr.Paren(exprFromParseError ($2 lhsm), rhs parseState 1, None, lhsm) } | LPAREN error rparen diff --git a/src/fsharp/service/ServiceParamInfoLocations.fs b/src/fsharp/service/ServiceParamInfoLocations.fs index 7295e2e08e6..685471f18fb 100755 --- a/src/fsharp/service/ServiceParamInfoLocations.fs +++ b/src/fsharp/service/ServiceParamInfoLocations.fs @@ -100,7 +100,7 @@ module internal NoteworthyParamInfoLocationsImpl = let inner = traverseSynExpr synExpr match inner with | None -> - if AstTraversal.rangeContainsPosEdgesExclusive parenRange pos then + if AstTraversal.rangeContainsPosLeftEdgeExclusiveAndRightEdgeInclusive parenRange pos then let commasAndCloseParen = ((synExprList, commaRanges@[parenRange]) ||> List.map2 (fun e c -> c.End, getNamedParamName e)) let r = Found (parenRange.Start, commasAndCloseParen, rpRangeOpt.IsSome) r, None diff --git a/src/fsharp/xlf/FSComp.txt.fr.xlf b/src/fsharp/xlf/FSComp.txt.fr.xlf index 50b2101bf75..a787f415bd6 100644 --- a/src/fsharp/xlf/FSComp.txt.fr.xlf +++ b/src/fsharp/xlf/FSComp.txt.fr.xlf @@ -5914,17 +5914,17 @@ {0} var in collection {1} (outerKey = innerKey). Note that parentheses are required after '{2}' - {0} var in collection {1} (outerKey = innerKey). Notez que les parenthèses sont obligatoires après '{2}' + var {0} dans la collection {1} (outerKey = innerKey). Notez que les parenthèses sont obligatoires après '{2}' {0} var in collection {1} (outerKey = innerKey) into group. Note that parentheses are required after '{2}' - {0} var in collection {1} (outerKey = innerKey) dans le groupe. Notez que les parenthèses sont obligatoires après '{2}' + var {0} dans la collection {1} (outerKey = innerKey) au sein du groupe. Notez que les parenthèses sont obligatoires après '{2}' {0} var in collection - {0} var in collection + var {0} dans la collection diff --git a/src/fsharp/xlf/FSComp.txt.ja.xlf b/src/fsharp/xlf/FSComp.txt.ja.xlf index 23b8db64d87..60b16f228f4 100644 --- a/src/fsharp/xlf/FSComp.txt.ja.xlf +++ b/src/fsharp/xlf/FSComp.txt.ja.xlf @@ -5916,12 +5916,12 @@ {0} var in collection {1} (outerKey = innerKey). Note that parentheses are required after '{2}' - {0} var in collection {1} (outerKey = innerKey)。'{2}' の後ろにはかっこが必要です。 + {0} var in collection {1} (outerKey = innerKey)。'{2}' の後にかっこが必要であることに注意してください {0} var in collection {1} (outerKey = innerKey) into group. Note that parentheses are required after '{2}' - {0} var in collection {1} (outerKey = innerKey) into group。'{2}' の後ろにかっこが必要です + コレクション {1} (outerKey = innerKey) の {0} をグループに var 宣言します。'{2}' の後にかっこが必要であることに注意してください diff --git a/src/fsharp/xlf/FSComp.txt.ko.xlf b/src/fsharp/xlf/FSComp.txt.ko.xlf index aba87e79c25..075fd90c402 100644 --- a/src/fsharp/xlf/FSComp.txt.ko.xlf +++ b/src/fsharp/xlf/FSComp.txt.ko.xlf @@ -5914,7 +5914,7 @@ {0} var in collection {1} (outerKey = innerKey). Note that parentheses are required after '{2}' - {0} var in collection {1} (outerKey = innerKey). '{2}' 다음에 괄호가 필요합니다. + {0} var in collection {1} (outerKey = innerKey). '{2}' 뒤에 괄호가 필요합니다. diff --git a/src/fsharp/xlf/FSComp.txt.zh-Hans.xlf b/src/fsharp/xlf/FSComp.txt.zh-Hans.xlf index ef836689a48..b53cb57e5e0 100644 --- a/src/fsharp/xlf/FSComp.txt.zh-Hans.xlf +++ b/src/fsharp/xlf/FSComp.txt.zh-Hans.xlf @@ -5914,17 +5914,17 @@ {0} var in collection {1} (outerKey = innerKey). Note that parentheses are required after '{2}' - {0} var in collection {1} (outerKey = innerKey)。请注意，“{2}”后需使用括号 + 集合 {1} (outerKey = innerKey)中的 {0} var。请注意，“{2}”后面要使用圆括号 {0} var in collection {1} (outerKey = innerKey) into group. Note that parentheses are required after '{2}' - {0} var in collection {1} (outerKey = innerKey) into group。请注意，“{2}”后需使用括号。 + 集合 {1} (outerKey = innerKey) 中的 {0} var 到组中。请注意, 在 "{2}" 之后需要圆括号 {0} var in collection - {0} var in collection + 集合中的 {0} var diff --git a/src/fsharp/xlf/FSComp.txt.zh-Hant.xlf b/src/fsharp/xlf/FSComp.txt.zh-Hant.xlf index 36d58223f3e..04647e699d9 100644 --- a/src/fsharp/xlf/FSComp.txt.zh-Hant.xlf +++ b/src/fsharp/xlf/FSComp.txt.zh-Hant.xlf @@ -5914,17 +5914,17 @@ {0} var in collection {1} (outerKey = innerKey). Note that parentheses are required after '{2}' - {0} var in collection {1} (outerKey = innerKey)。注意: '{2}' 之後須有括號 + 集合 {1} 中的 {0} var (outerKey = innerKey)。請注意，'{2}' 後需要括弧 {0} var in collection {1} (outerKey = innerKey) into group. Note that parentheses are required after '{2}' - {0} var in collection {1} (outerKey = innerKey) into group。注意: '{2}' 之後須有括號 + 集合 {1} 中的 {0} var (outerKey = innerKey) 進入群組。請注意，'{2}' 後需要括弧。 {0} var in collection - {0} var in collection + 集合中的 {0} var diff --git a/src/fsharp/xlf/FSStrings.ja.xlf b/src/fsharp/xlf/FSStrings.ja.xlf index fb735af4f12..eb91f5fb4fc 100644 --- a/src/fsharp/xlf/FSStrings.ja.xlf +++ b/src/fsharp/xlf/FSStrings.ja.xlf @@ -1609,7 +1609,7 @@ {0} (Code={1}) - {0} (Code={1}) + {0} (コード={1}) diff --git a/src/fsharp/xlf/FSStrings.pt-BR.xlf b/src/fsharp/xlf/FSStrings.pt-BR.xlf index e8c28af73b5..3c2a5f22963 100644 --- a/src/fsharp/xlf/FSStrings.pt-BR.xlf +++ b/src/fsharp/xlf/FSStrings.pt-BR.xlf @@ -1609,7 +1609,7 @@ {0} (Code={1}) - {0} (Code={1}) + {0} (código = {1}) diff --git a/src/fsharp/xlf/FSStrings.tr.xlf b/src/fsharp/xlf/FSStrings.tr.xlf index fcb69cb0ad0..f4cba2f1216 100644 --- a/src/fsharp/xlf/FSStrings.tr.xlf +++ b/src/fsharp/xlf/FSStrings.tr.xlf @@ -954,7 +954,7 @@ whitespace - whitespace + boşluk diff --git a/tests/FSharp.Compiler.UnitTests/Compiler.fs b/tests/FSharp.Compiler.UnitTests/Compiler.fs new file mode 100644 index 00000000000..a83d8a6f7c3 --- /dev/null +++ b/tests/FSharp.Compiler.UnitTests/Compiler.fs @@ -0,0 +1,59 @@ +// Copyright (c) Microsoft Corporation. All Rights Reserved. See License.txt in the project root for license information. + +namespace FSharp.Compiler.UnitTests + +open System +open Microsoft.FSharp.Compiler.Text +open Microsoft.FSharp.Compiler.SourceCodeServices + +open NUnit.Framework + +[] +module Compiler = + + let checker = FSharpChecker.Create() + + let private defaultProjectOptions = + { + ProjectFileName = "Z:\\test.fsproj" + ProjectId = None + SourceFiles = [|"test.fs"|] + OtherOptions = [||] + ReferencedProjects = [||] + IsIncompleteTypeCheckEnvironment = false + UseScriptResolutionRules = false + LoadTime = DateTime() + UnresolvedReferences = None + OriginalLoadReferences = [] + ExtraProjectInfo = None + Stamp = None + } + + let AssertPass (source: string) = + let parseResults, fileAnswer = checker.ParseAndCheckFileInProject("test.fs", 0, SourceText.ofString source, defaultProjectOptions) |> Async.RunSynchronously + + Assert.True(parseResults.Errors.Length = 0, sprintf "Parse errors: %A" parseResults.Errors) + + match fileAnswer with + | FSharpCheckFileAnswer.Aborted _ -> Assert.Fail("Type Checker Aborted") + | FSharpCheckFileAnswer.Succeeded(typeCheckResults) -> + + Assert.True(typeCheckResults.Errors.Length = 0, sprintf "Type Check errors: %A" typeCheckResults.Errors) + + let AssertSingleErrorTypeCheck (source: string) (expectedErrorNumber: int) (expectedErrorRange: int * int * int * int) (expectedErrorMsg: string) = + let parseResults, fileAnswer = checker.ParseAndCheckFileInProject("test.fs", 0, SourceText.ofString source, defaultProjectOptions) |> Async.RunSynchronously + + Assert.True(parseResults.Errors.Length = 0, sprintf "Parse errors: %A" parseResults.Errors) + + match fileAnswer with + | FSharpCheckFileAnswer.Aborted _ -> Assert.Fail("Type Checker Aborted") + | FSharpCheckFileAnswer.Succeeded(typeCheckResults) -> + + Assert.True(typeCheckResults.Errors.Length = 1, sprintf "Expected one type check error: %A" typeCheckResults.Errors) + typeCheckResults.Errors + |> Array.iter (fun info -> + Assert.AreEqual(FSharpErrorSeverity.Error, info.Severity) + Assert.AreEqual(expectedErrorNumber, info.ErrorNumber, "expectedErrorNumber") + Assert.AreEqual(expectedErrorRange, (info.StartLineAlternate, info.StartColumn, info.EndLineAlternate, info.EndColumn), "expectedErrorRange") + Assert.AreEqual(expectedErrorMsg, info.Message, "expectedErrorMsg") + ) \ No newline at end of file diff --git a/tests/FSharp.Compiler.UnitTests/FSharp.Compiler.UnitTests.fsproj b/tests/FSharp.Compiler.UnitTests/FSharp.Compiler.UnitTests.fsproj index bbeac7ee59f..39f58117621 100644 --- a/tests/FSharp.Compiler.UnitTests/FSharp.Compiler.UnitTests.fsproj +++ b/tests/FSharp.Compiler.UnitTests/FSharp.Compiler.UnitTests.fsproj @@ -16,7 +16,9 @@ + + diff --git a/tests/FSharp.Compiler.UnitTests/ILHelpers.fs b/tests/FSharp.Compiler.UnitTests/ILHelpers.fs index 372e11d0702..ddaf4c6fd60 100644 --- a/tests/FSharp.Compiler.UnitTests/ILHelpers.fs +++ b/tests/FSharp.Compiler.UnitTests/ILHelpers.fs @@ -10,9 +10,10 @@ open NUnit.Framework open Microsoft.FSharp.Compiler.SourceCodeServices +[] module ILChecker = - let checker = FSharpChecker.Create() + let checker = Compiler.checker let private (++) a b = Path.Combine(a,b) diff --git a/tests/FSharp.Compiler.UnitTests/Language/AnonRecords.fs b/tests/FSharp.Compiler.UnitTests/Language/AnonRecords.fs new file mode 100644 index 00000000000..b507fa9afe2 --- /dev/null +++ b/tests/FSharp.Compiler.UnitTests/Language/AnonRecords.fs @@ -0,0 +1,47 @@ +// Copyright (c) Microsoft Corporation. All Rights Reserved. See License.txt in the project root for license information. + +namespace FSharp.Compiler.UnitTests + +open NUnit.Framework + +[] +module AnonRecords = + + [] + let NotStructConstraintPass() = + Compiler.AssertPass + """ +type RefClass<'a when 'a : not struct>() = class end +let rAnon = RefClass<{| R: int |}>() + """ + + [] + let StructConstraintPass() = + Compiler.AssertPass + """ +type StructClass<'a when 'a : struct>() = class end +let sAnon = StructClass() + """ + + [] + let NotStructConstraintFail() = + Compiler.AssertSingleErrorTypeCheck + """ + type RefClass<'a when 'a : not struct>() = class end + let rAnon = RefClass() + """ + 1 + (3, 16, 3, 45) + "A generic construct requires that the type 'struct {|R : int|}' have reference semantics, but it does not, i.e. it is a struct" + + [] + let StructConstraintFail() = + Compiler.AssertSingleErrorTypeCheck + """ +type StructClass<'a when 'a : struct>() = class end +let sAnon = StructClass<{| S: int |}>() + """ + 1 + (3, 12, 3, 37) + "A generic construct requires that the type '{|S : int|}' is a CLI or F# struct type" + diff --git a/tests/fsharp/single-test.fs b/tests/fsharp/single-test.fs index 54915dc1ec1..6ac31be4289 100644 --- a/tests/fsharp/single-test.fs +++ b/tests/fsharp/single-test.fs @@ -89,7 +89,7 @@ let generateOverrides = " template -let generateProjectArtifacts (pc:ProjectConfiguration) targetFramework = +let generateProjectArtifacts (pc:ProjectConfiguration) targetFramework configuration = let computeSourceItems addDirectory addCondition (compileItem:CompileItem) sources = let computeInclude src = let fileName = if addDirectory then Path.Combine(pc.SourceDirectory, src) else src @@ -172,7 +172,7 @@ let generateProjectArtifacts (pc:ProjectConfiguration) targetFramework = |> replaceTokens "$(OPTIMIZE)" optimize |> replaceTokens "$(DEBUG)" debug |> replaceTokens "$(TARGETFRAMEWORK)" targetFramework - |> replaceTokens "$(RestoreFromArtifactsPath)" (Path.GetFullPath(__SOURCE_DIRECTORY__) + "/../../artifacts") + |> replaceTokens "$(RestoreFromArtifactsPath)" (Path.GetFullPath(__SOURCE_DIRECTORY__) + "/../../artifacts/packages/" + configuration) generateProjBody @@ -218,7 +218,7 @@ let singleTestBuildAndRunCore cfg copyFiles p = let executeFsc testCompilerVersion targetFramework = let propsBody = generateProps testCompilerVersion emitFile propsFileName propsBody - let projectBody = generateProjectArtifacts pc targetFramework + let projectBody = generateProjectArtifacts pc targetFramework cfg.BUILD_CONFIG emitFile projectFileName projectBody use testOkFile = new FileGuard(Path.Combine(directory, "test.ok")) exec { cfg with Directory = directory } cfg.DotNetExe (sprintf "run -f %s" targetFramework) @@ -228,7 +228,7 @@ let singleTestBuildAndRunCore cfg copyFiles p = let executeFsi testCompilerVersion targetFramework = let propsBody = generateProps testCompilerVersion emitFile propsFileName propsBody - let projectBody = generateProjectArtifacts pc targetFramework + let projectBody = generateProjectArtifacts pc targetFramework cfg.BUILD_CONFIG emitFile projectFileName projectBody use testOkFile = new FileGuard(Path.Combine(directory, "test.ok")) exec { cfg with Directory = directory } cfg.DotNetExe "build /t:RunFSharpScript" diff --git a/vsintegration/ProjectTemplates/ConsoleProject/Template/ConsoleApplication.vstemplate b/vsintegration/ProjectTemplates/ConsoleProject/Template/ConsoleApplication.vstemplate index 9dc8a923a9b..457a0d84b66 100644 --- a/vsintegration/ProjectTemplates/ConsoleProject/Template/ConsoleApplication.vstemplate +++ b/vsintegration/ProjectTemplates/ConsoleProject/Template/ConsoleApplication.vstemplate @@ -27,7 +27,7 @@ - + diff --git a/vsintegration/ProjectTemplates/LibraryProject/Template/Library.vstemplate b/vsintegration/ProjectTemplates/LibraryProject/Template/Library.vstemplate index fbd5c5d7352..07c8ab1065e 100644 --- a/vsintegration/ProjectTemplates/LibraryProject/Template/Library.vstemplate +++ b/vsintegration/ProjectTemplates/LibraryProject/Template/Library.vstemplate @@ -27,7 +27,7 @@ - + diff --git a/vsintegration/ProjectTemplates/TutorialProject/Template/Tutorial.vstemplate b/vsintegration/ProjectTemplates/TutorialProject/Template/Tutorial.vstemplate index c1fbf7f6420..73b11c8c907 100644 --- a/vsintegration/ProjectTemplates/TutorialProject/Template/Tutorial.vstemplate +++ b/vsintegration/ProjectTemplates/TutorialProject/Template/Tutorial.vstemplate @@ -25,7 +25,7 @@ - + diff --git a/vsintegration/ProjectTemplates/TutorialProject/Template/xlf/Tutorial.fsx.ja.xlf b/vsintegration/ProjectTemplates/TutorialProject/Template/xlf/Tutorial.fsx.ja.xlf index 3162e1c12c9..5694cd3bf7b 100644 --- a/vsintegration/ProjectTemplates/TutorialProject/Template/xlf/Tutorial.fsx.ja.xlf +++ b/vsintegration/ProjectTemplates/TutorialProject/Template/xlf/Tutorial.fsx.ja.xlf @@ -899,7 +899,7 @@ Records are an aggregate of named values, with optional members (such as methods). - レコードは、オプションのメンバー (メソッドなど) を含む名前付きの値の集合です。 + レコードは、オプションのメンバー (メソッドなど) を含む名前付きの値の集約です。 @@ -1294,7 +1294,7 @@ Option values are any kind of value tagged with either 'Some' or 'None'. - オプション値とは、'Some' または 'None' が指定されたあらゆる種類の値です。 + オプション値とは、'Some' または 'None' がタグされたあらゆる種類の値です。 diff --git a/vsintegration/ProjectTemplates/TutorialProject/Template/xlf/Tutorial.fsx.pl.xlf b/vsintegration/ProjectTemplates/TutorialProject/Template/xlf/Tutorial.fsx.pl.xlf index 26fcc37dd50..3b4b512cd2c 100644 --- a/vsintegration/ProjectTemplates/TutorialProject/Template/xlf/Tutorial.fsx.pl.xlf +++ b/vsintegration/ProjectTemplates/TutorialProject/Template/xlf/Tutorial.fsx.pl.xlf @@ -1294,7 +1294,7 @@ Option values are any kind of value tagged with either 'Some' or 'None'. - Wartości opcji to dowolne wartości oznaczone jako „Some” lub „None”. + Wartości opcji to dowolne wartości otagowane jako „Some” lub „None”. diff --git a/vsintegration/ProjectTemplates/TutorialProject/Template/xlf/Tutorial.fsx.tr.xlf b/vsintegration/ProjectTemplates/TutorialProject/Template/xlf/Tutorial.fsx.tr.xlf index 69b62072526..e41d20b7fa0 100644 --- a/vsintegration/ProjectTemplates/TutorialProject/Template/xlf/Tutorial.fsx.tr.xlf +++ b/vsintegration/ProjectTemplates/TutorialProject/Template/xlf/Tutorial.fsx.tr.xlf @@ -899,7 +899,7 @@ Records are an aggregate of named values, with optional members (such as methods). - Kayıtlar, isteğe bağlı üyeleri (örneğin, metotlar) içeren adlandırılmış değerlerin toplamıdır. + Kayıtlar, isteğe bağlı üyeleri (örneğin, metotlar) içeren adlandırılmış değerlerin kümesidir. diff --git a/vsintegration/src/FSharp.ProjectSystem.Base/Project/xlf/Microsoft.VisualStudio.Package.Project.cs.xlf b/vsintegration/src/FSharp.ProjectSystem.Base/Project/xlf/Microsoft.VisualStudio.Package.Project.cs.xlf index 3464972fc9a..97941503b9f 100644 --- a/vsintegration/src/FSharp.ProjectSystem.Base/Project/xlf/Microsoft.VisualStudio.Package.Project.cs.xlf +++ b/vsintegration/src/FSharp.ProjectSystem.Base/Project/xlf/Microsoft.VisualStudio.Package.Project.cs.xlf @@ -792,7 +792,7 @@ Path - PATH + Cesta diff --git a/vsintegration/src/FSharp.ProjectSystem.Base/Project/xlf/Microsoft.VisualStudio.Package.Project.es.xlf b/vsintegration/src/FSharp.ProjectSystem.Base/Project/xlf/Microsoft.VisualStudio.Package.Project.es.xlf index c7f0e03d129..b94354b317b 100644 --- a/vsintegration/src/FSharp.ProjectSystem.Base/Project/xlf/Microsoft.VisualStudio.Package.Project.es.xlf +++ b/vsintegration/src/FSharp.ProjectSystem.Base/Project/xlf/Microsoft.VisualStudio.Package.Project.es.xlf @@ -792,7 +792,7 @@ Path - PATH + Ruta de acceso diff --git a/vsintegration/src/FSharp.ProjectSystem.Base/Project/xlf/Microsoft.VisualStudio.Package.Project.fr.xlf b/vsintegration/src/FSharp.ProjectSystem.Base/Project/xlf/Microsoft.VisualStudio.Package.Project.fr.xlf index b12a2b12562..98538c729e1 100644 --- a/vsintegration/src/FSharp.ProjectSystem.Base/Project/xlf/Microsoft.VisualStudio.Package.Project.fr.xlf +++ b/vsintegration/src/FSharp.ProjectSystem.Base/Project/xlf/Microsoft.VisualStudio.Package.Project.fr.xlf @@ -792,7 +792,7 @@ Path - PATH + Chemin diff --git a/vsintegration/src/FSharp.ProjectSystem.Base/Project/xlf/Microsoft.VisualStudio.Package.Project.ja.xlf b/vsintegration/src/FSharp.ProjectSystem.Base/Project/xlf/Microsoft.VisualStudio.Package.Project.ja.xlf index 9fca5b1025a..63dcd0ecdd7 100644 --- a/vsintegration/src/FSharp.ProjectSystem.Base/Project/xlf/Microsoft.VisualStudio.Package.Project.ja.xlf +++ b/vsintegration/src/FSharp.ProjectSystem.Base/Project/xlf/Microsoft.VisualStudio.Package.Project.ja.xlf @@ -792,7 +792,7 @@ Path - PATH + パス diff --git a/vsintegration/src/FSharp.ProjectSystem.Base/Project/xlf/Microsoft.VisualStudio.Package.Project.ko.xlf b/vsintegration/src/FSharp.ProjectSystem.Base/Project/xlf/Microsoft.VisualStudio.Package.Project.ko.xlf index 8bcbf94cee3..bbdd7cb68c3 100644 --- a/vsintegration/src/FSharp.ProjectSystem.Base/Project/xlf/Microsoft.VisualStudio.Package.Project.ko.xlf +++ b/vsintegration/src/FSharp.ProjectSystem.Base/Project/xlf/Microsoft.VisualStudio.Package.Project.ko.xlf @@ -257,7 +257,7 @@ Misc - Misc + 기타 @@ -792,7 +792,7 @@ Path - PATH + 경로 diff --git a/vsintegration/src/FSharp.ProjectSystem.Base/Project/xlf/Microsoft.VisualStudio.Package.Project.pl.xlf b/vsintegration/src/FSharp.ProjectSystem.Base/Project/xlf/Microsoft.VisualStudio.Package.Project.pl.xlf index 0a79a932e19..00055ae4a89 100644 --- a/vsintegration/src/FSharp.ProjectSystem.Base/Project/xlf/Microsoft.VisualStudio.Package.Project.pl.xlf +++ b/vsintegration/src/FSharp.ProjectSystem.Base/Project/xlf/Microsoft.VisualStudio.Package.Project.pl.xlf @@ -257,7 +257,7 @@ Misc - Misc + Różne diff --git a/vsintegration/src/FSharp.ProjectSystem.Base/Project/xlf/Microsoft.VisualStudio.Package.Project.pt-BR.xlf b/vsintegration/src/FSharp.ProjectSystem.Base/Project/xlf/Microsoft.VisualStudio.Package.Project.pt-BR.xlf index e2202c64ac0..f72f70bbe81 100644 --- a/vsintegration/src/FSharp.ProjectSystem.Base/Project/xlf/Microsoft.VisualStudio.Package.Project.pt-BR.xlf +++ b/vsintegration/src/FSharp.ProjectSystem.Base/Project/xlf/Microsoft.VisualStudio.Package.Project.pt-BR.xlf @@ -792,7 +792,7 @@ Path - PATH + Caminho diff --git a/vsintegration/src/FSharp.ProjectSystem.Base/Project/xlf/Microsoft.VisualStudio.Package.Project.ru.xlf b/vsintegration/src/FSharp.ProjectSystem.Base/Project/xlf/Microsoft.VisualStudio.Package.Project.ru.xlf index be837948f25..d279159cd7d 100644 --- a/vsintegration/src/FSharp.ProjectSystem.Base/Project/xlf/Microsoft.VisualStudio.Package.Project.ru.xlf +++ b/vsintegration/src/FSharp.ProjectSystem.Base/Project/xlf/Microsoft.VisualStudio.Package.Project.ru.xlf @@ -612,7 +612,7 @@ A 'UsingTask' tag which registers the '{1}' task was found in the project file '{0}'. 'UsingTask' tags in the project file take precedence over those in the imported .TARGETS files, and therefore could be used to execute arbitrary code during an otherwise unmodified build process. - В файле проекта "{0}" обнаружен тег "UsingTask", регистрирующий задачу "{1}". Метки <UsingTask> в файле проекта имеют превосходство перед импортированными .TARGETS-файлами, и поэтому могут быть использованы для выполнения произвольного кода во время не изменяемого другими средствами процесса сборки. + В файле проекта "{0}" обнаружен тег "UsingTask", регистрирующий задачу "{1}". Теги "UsingTask" в файле проекта имеют превосходство перед импортированными .TARGETS-файлами, и поэтому могут быть использованы для выполнения произвольного кода во время не изменяемого другими средствами процесса сборки. diff --git a/vsintegration/src/FSharp.ProjectSystem.Base/Project/xlf/Microsoft.VisualStudio.Package.Project.tr.xlf b/vsintegration/src/FSharp.ProjectSystem.Base/Project/xlf/Microsoft.VisualStudio.Package.Project.tr.xlf index eb91220d1c5..8688a0ce393 100644 --- a/vsintegration/src/FSharp.ProjectSystem.Base/Project/xlf/Microsoft.VisualStudio.Package.Project.tr.xlf +++ b/vsintegration/src/FSharp.ProjectSystem.Base/Project/xlf/Microsoft.VisualStudio.Package.Project.tr.xlf @@ -257,7 +257,7 @@ Misc - Misc + Çeşitli @@ -792,7 +792,7 @@ Path - PATH + Yol diff --git a/vsintegration/src/FSharp.ProjectSystem.Base/Project/xlf/Microsoft.VisualStudio.Package.Project.zh-Hans.xlf b/vsintegration/src/FSharp.ProjectSystem.Base/Project/xlf/Microsoft.VisualStudio.Package.Project.zh-Hans.xlf index 04d1f869b24..d5a9f4f85d4 100644 --- a/vsintegration/src/FSharp.ProjectSystem.Base/Project/xlf/Microsoft.VisualStudio.Package.Project.zh-Hans.xlf +++ b/vsintegration/src/FSharp.ProjectSystem.Base/Project/xlf/Microsoft.VisualStudio.Package.Project.zh-Hans.xlf @@ -792,7 +792,7 @@ Path - PATH + 路径 diff --git a/vsintegration/src/FSharp.ProjectSystem.Base/Project/xlf/Microsoft.VisualStudio.Package.Project.zh-Hant.xlf b/vsintegration/src/FSharp.ProjectSystem.Base/Project/xlf/Microsoft.VisualStudio.Package.Project.zh-Hant.xlf index 806ada3d21c..52c142cf47a 100644 --- a/vsintegration/src/FSharp.ProjectSystem.Base/Project/xlf/Microsoft.VisualStudio.Package.Project.zh-Hant.xlf +++ b/vsintegration/src/FSharp.ProjectSystem.Base/Project/xlf/Microsoft.VisualStudio.Package.Project.zh-Hant.xlf @@ -792,7 +792,7 @@ Path - PATH + 路徑 diff --git a/vsintegration/src/FSharp.ProjectSystem.PropertyPages/PropertyPages/xlf/ReferencePathsPropPage.de.xlf b/vsintegration/src/FSharp.ProjectSystem.PropertyPages/PropertyPages/xlf/ReferencePathsPropPage.de.xlf index 98b3a7a621c..494cdfc5c08 100644 --- a/vsintegration/src/FSharp.ProjectSystem.PropertyPages/PropertyPages/xlf/ReferencePathsPropPage.de.xlf +++ b/vsintegration/src/FSharp.ProjectSystem.PropertyPages/PropertyPages/xlf/ReferencePathsPropPage.de.xlf @@ -39,7 +39,7 @@ Delete - löschen + Löschen diff --git a/vsintegration/src/FSharp.ProjectSystem.PropertyPages/Resources/xlf/Microsoft.VisualStudio.Editors.Designer.de.xlf b/vsintegration/src/FSharp.ProjectSystem.PropertyPages/Resources/xlf/Microsoft.VisualStudio.Editors.Designer.de.xlf index 7e4ad280c72..5af40395147 100644 --- a/vsintegration/src/FSharp.ProjectSystem.PropertyPages/Resources/xlf/Microsoft.VisualStudio.Editors.Designer.de.xlf +++ b/vsintegration/src/FSharp.ProjectSystem.PropertyPages/Resources/xlf/Microsoft.VisualStudio.Editors.Designer.de.xlf @@ -875,7 +875,7 @@ Fehler: Static - Static + Statisch diff --git a/vsintegration/src/FSharp.ProjectSystem.PropertyPages/Resources/xlf/Microsoft.VisualStudio.Editors.Designer.fr.xlf b/vsintegration/src/FSharp.ProjectSystem.PropertyPages/Resources/xlf/Microsoft.VisualStudio.Editors.Designer.fr.xlf index 4ef85b10179..83a941758ad 100644 --- a/vsintegration/src/FSharp.ProjectSystem.PropertyPages/Resources/xlf/Microsoft.VisualStudio.Editors.Designer.fr.xlf +++ b/vsintegration/src/FSharp.ProjectSystem.PropertyPages/Resources/xlf/Microsoft.VisualStudio.Editors.Designer.fr.xlf @@ -1969,12 +1969,12 @@ CONSIDER: get this from CodeDom Portable Network Graphics - Portable Network Graphics + Format PNG Friendly Image types Tag Image File Format - Tag Image File Format + Format TIF Friendly Image types @@ -2063,7 +2063,7 @@ CONSIDER: get this from CodeDom Portable Network Graphics - Portable Network Graphics + Format PNG # File dialog filters # # E.g., for icons, the actual filter created would look like "Icons (*.ico)". These resources @@ -2090,7 +2090,7 @@ CONSIDER: get this from CodeDom Tag Image File Format - Tag Image File Format + Format TIF # File dialog filters # # E.g., for icons, the actual filter created would look like "Icons (*.ico)". These resources diff --git a/vsintegration/src/FSharp.ProjectSystem.PropertyPages/Resources/xlf/Microsoft.VisualStudio.Editors.Designer.pl.xlf b/vsintegration/src/FSharp.ProjectSystem.PropertyPages/Resources/xlf/Microsoft.VisualStudio.Editors.Designer.pl.xlf index ba9a65d0e57..e75adbf3699 100644 --- a/vsintegration/src/FSharp.ProjectSystem.PropertyPages/Resources/xlf/Microsoft.VisualStudio.Editors.Designer.pl.xlf +++ b/vsintegration/src/FSharp.ProjectSystem.PropertyPages/Resources/xlf/Microsoft.VisualStudio.Editors.Designer.pl.xlf @@ -1974,7 +1974,7 @@ CONSIDER: get this from CodeDom Tag Image File Format - Znacznikowy format pliku obrazu TIF + Tag Image File Format Friendly Image types @@ -2090,7 +2090,7 @@ CONSIDER: get this from CodeDom Tag Image File Format - Znacznikowy format pliku obrazu TIF + Tag Image File Format # File dialog filters # # E.g., for icons, the actual filter created would look like "Icons (*.ico)". These resources diff --git a/vsintegration/src/FSharp.ProjectSystem.PropertyPages/Resources/xlf/Microsoft.VisualStudio.Editors.Designer.pt-BR.xlf b/vsintegration/src/FSharp.ProjectSystem.PropertyPages/Resources/xlf/Microsoft.VisualStudio.Editors.Designer.pt-BR.xlf index 1c4b940f208..3cd57027203 100644 --- a/vsintegration/src/FSharp.ProjectSystem.PropertyPages/Resources/xlf/Microsoft.VisualStudio.Editors.Designer.pt-BR.xlf +++ b/vsintegration/src/FSharp.ProjectSystem.PropertyPages/Resources/xlf/Microsoft.VisualStudio.Editors.Designer.pt-BR.xlf @@ -2072,7 +2072,7 @@ CONSIDER: get this from CodeDom Graphics Interchange Format - Graphics Interchange Format + Formato de intercâmbio de gráficos # File dialog filters # # E.g., for icons, the actual filter created would look like "Icons (*.ico)". These resources diff --git a/vsintegration/src/FSharp.ProjectSystem.PropertyPages/Resources/xlf/Microsoft.VisualStudio.Editors.Designer.ru.xlf b/vsintegration/src/FSharp.ProjectSystem.PropertyPages/Resources/xlf/Microsoft.VisualStudio.Editors.Designer.ru.xlf index 3a93c4d1fe1..94a58397fe8 100644 --- a/vsintegration/src/FSharp.ProjectSystem.PropertyPages/Resources/xlf/Microsoft.VisualStudio.Editors.Designer.ru.xlf +++ b/vsintegration/src/FSharp.ProjectSystem.PropertyPages/Resources/xlf/Microsoft.VisualStudio.Editors.Designer.ru.xlf @@ -1217,7 +1217,7 @@ Error: Microsoft Visual Studio - Службы Microsoft Visual Studio + Microsoft Visual Studio Error reporting @@ -1813,7 +1813,7 @@ CONSIDER: get this from CodeDom Size - Size + Размер Columns for the "Details" view of the resource editor diff --git a/vsintegration/src/FSharp.UIResources/xlf/Strings.cs.xlf b/vsintegration/src/FSharp.UIResources/xlf/Strings.cs.xlf index 904e59edc6c..2e928e6fc2f 100644 --- a/vsintegration/src/FSharp.UIResources/xlf/Strings.cs.xlf +++ b/vsintegration/src/FSharp.UIResources/xlf/Strings.cs.xlf @@ -164,22 +164,22 @@ Always add new line on enter - Always add new line on enter + Při stisku Enter vždy přidat nový řádek Never add new line on enter - Never add new line on enter + Při stisku Enter nikdy nepřidávat nový řádek Only add new line on enter after end of fully typed word - Only add new line on enter after end of fully typed word + Při stisku Enter přidat nový řádek jenom po dopsání celého slova Enter key behavior - Enter key behavior + Chování klávesy Enter @@ -189,7 +189,7 @@ Suggest names for unresolved identifiers - Suggest names for unresolved identifiers + Navrhovat názvy pro nerozpoznané identifikátory diff --git a/vsintegration/src/FSharp.UIResources/xlf/Strings.de.xlf b/vsintegration/src/FSharp.UIResources/xlf/Strings.de.xlf index 086c82ac044..339fde70c66 100644 --- a/vsintegration/src/FSharp.UIResources/xlf/Strings.de.xlf +++ b/vsintegration/src/FSharp.UIResources/xlf/Strings.de.xlf @@ -164,22 +164,22 @@ Always add new line on enter - Always add new line on enter + Nach Drücken der EINGABETASTE immer neue Zeile hinzufügen Never add new line on enter - Never add new line on enter + Nach Drücken der EINGABETASTE niemals neue Zeile hinzufügen Only add new line on enter after end of fully typed word - Only add new line on enter after end of fully typed word + Nach Drücken der EINGABETASTE nur nach dem Ende eines vollständigen Worts neue Zeile hinzufügen Enter key behavior - Enter key behavior + Eingabetastenverhalten @@ -189,7 +189,7 @@ Suggest names for unresolved identifiers - Suggest names for unresolved identifiers + Namen für nicht aufgelöste Bezeichner vorschlagen diff --git a/vsintegration/src/FSharp.UIResources/xlf/Strings.es.xlf b/vsintegration/src/FSharp.UIResources/xlf/Strings.es.xlf index 5ef3e571cd8..48a36fbec9b 100644 --- a/vsintegration/src/FSharp.UIResources/xlf/Strings.es.xlf +++ b/vsintegration/src/FSharp.UIResources/xlf/Strings.es.xlf @@ -164,22 +164,22 @@ Always add new line on enter - Always add new line on enter + Siempre agregar una nueva línea al pulsar Intro Never add new line on enter - Never add new line on enter + Nunca agregar una nueva línea al pulsar Intro Only add new line on enter after end of fully typed word - Only add new line on enter after end of fully typed word + Solo agregar una nueva línea al pulsar Intro cuando se haya terminado de escribir completamente una palabra Enter key behavior - Enter key behavior + Comportamiento de la tecla Intro @@ -189,7 +189,7 @@ Suggest names for unresolved identifiers - Suggest names for unresolved identifiers + Sugerir nombres para los identificadores no resueltos diff --git a/vsintegration/src/FSharp.UIResources/xlf/Strings.fr.xlf b/vsintegration/src/FSharp.UIResources/xlf/Strings.fr.xlf index a7cc3d6537c..4e987a4e393 100644 --- a/vsintegration/src/FSharp.UIResources/xlf/Strings.fr.xlf +++ b/vsintegration/src/FSharp.UIResources/xlf/Strings.fr.xlf @@ -164,22 +164,22 @@ Always add new line on enter - Always add new line on enter + Toujours ajouter une nouvelle ligne en appuyant sur Entrée Never add new line on enter - Never add new line on enter + Ne jamais ajouter de nouvelle ligne en appuyant sur Entrée Only add new line on enter after end of fully typed word - Only add new line on enter after end of fully typed word + Ajouter une nouvelle ligne en appuyant sur Entrée seulement après la fin d'un mot entièrement tapé Enter key behavior - Enter key behavior + Entrer le comportement de la touche @@ -189,7 +189,7 @@ Suggest names for unresolved identifiers - Suggest names for unresolved identifiers + Suggérer des noms pour les identificateurs non résolus diff --git a/vsintegration/src/FSharp.UIResources/xlf/Strings.it.xlf b/vsintegration/src/FSharp.UIResources/xlf/Strings.it.xlf index 64cfb1597f5..ecf110592cb 100644 --- a/vsintegration/src/FSharp.UIResources/xlf/Strings.it.xlf +++ b/vsintegration/src/FSharp.UIResources/xlf/Strings.it.xlf @@ -164,22 +164,22 @@ Always add new line on enter - Always add new line on enter + Aggiungi sempre una nuova riga dopo INVIO Never add new line on enter - Never add new line on enter + Non aggiungere mai una nuova riga dopo INVIO Only add new line on enter after end of fully typed word - Only add new line on enter after end of fully typed word + Aggiungi una nuova riga dopo INVIO solo alla fine della parola digitata Enter key behavior - Enter key behavior + Comportamento del tasto INVIO @@ -189,7 +189,7 @@ Suggest names for unresolved identifiers - Suggest names for unresolved identifiers + Suggerisci nomi per gli identificatori non risolti diff --git a/vsintegration/src/FSharp.UIResources/xlf/Strings.ja.xlf b/vsintegration/src/FSharp.UIResources/xlf/Strings.ja.xlf index 89fc7fb769a..2d0b053a6e7 100644 --- a/vsintegration/src/FSharp.UIResources/xlf/Strings.ja.xlf +++ b/vsintegration/src/FSharp.UIResources/xlf/Strings.ja.xlf @@ -164,22 +164,22 @@ Always add new line on enter - Always add new line on enter + Enter を押すと常に新しい行を追加します Never add new line on enter - Never add new line on enter + Enter 時に新しい行を追加しません Only add new line on enter after end of fully typed word - Only add new line on enter after end of fully typed word + 単語を完全に入力した後 Enter キーで新しい行のみを追加する Enter key behavior - Enter key behavior + Enter キー入力時動作 @@ -189,7 +189,7 @@ Suggest names for unresolved identifiers - Suggest names for unresolved identifiers + 未解決の識別子の名前を提案します diff --git a/vsintegration/src/FSharp.UIResources/xlf/Strings.ko.xlf b/vsintegration/src/FSharp.UIResources/xlf/Strings.ko.xlf index 7ebf712a5a0..53f8a84e137 100644 --- a/vsintegration/src/FSharp.UIResources/xlf/Strings.ko.xlf +++ b/vsintegration/src/FSharp.UIResources/xlf/Strings.ko.xlf @@ -164,22 +164,22 @@ Always add new line on enter - Always add new line on enter + 입력 시 새 줄 항상 추가 Never add new line on enter - Never add new line on enter + 입력 시 새 줄 추가 안 함 Only add new line on enter after end of fully typed word - Only add new line on enter after end of fully typed word + 단어를 모두 입력하고 <Enter> 키를 누르면 새 줄 추가 Enter key behavior - Enter key behavior + 키 동작 입력 @@ -189,7 +189,7 @@ Suggest names for unresolved identifiers - Suggest names for unresolved identifiers + 확인되지 않은 식별자의 이름 제안 diff --git a/vsintegration/src/FSharp.UIResources/xlf/Strings.pl.xlf b/vsintegration/src/FSharp.UIResources/xlf/Strings.pl.xlf index b3e252d85d8..c3a7fb1f18c 100644 --- a/vsintegration/src/FSharp.UIResources/xlf/Strings.pl.xlf +++ b/vsintegration/src/FSharp.UIResources/xlf/Strings.pl.xlf @@ -164,22 +164,22 @@ Always add new line on enter - Always add new line on enter + Zawsze dodawaj nowy wiersz po naciśnięciu klawisza Enter Never add new line on enter - Never add new line on enter + Nigdy nie dodawaj nowego wiersza po naciśnięciu klawisza Enter Only add new line on enter after end of fully typed word - Only add new line on enter after end of fully typed word + Dodaj nowy wiersz tylko po naciśnięciu klawisza Enter na końcu w pełni wpisanego wyrazu Enter key behavior - Enter key behavior + Zachowanie klawisza Enter @@ -189,7 +189,7 @@ Suggest names for unresolved identifiers - Suggest names for unresolved identifiers + Sugeruj nazwy w przypadku nierozpoznanych identyfikatorów diff --git a/vsintegration/src/FSharp.UIResources/xlf/Strings.pt-BR.xlf b/vsintegration/src/FSharp.UIResources/xlf/Strings.pt-BR.xlf index ec00e020030..f5d961bacfd 100644 --- a/vsintegration/src/FSharp.UIResources/xlf/Strings.pt-BR.xlf +++ b/vsintegration/src/FSharp.UIResources/xlf/Strings.pt-BR.xlf @@ -164,22 +164,22 @@ Always add new line on enter - Always add new line on enter + Sempre adicionar uma nova linha ao pressionar enter Never add new line on enter - Never add new line on enter + Nunca adicionar uma nova linha ao entrar Only add new line on enter after end of fully typed word - Only add new line on enter after end of fully typed word + Somente adiciona uma nova linha após digitar toda palavra Enter key behavior - Enter key behavior + Inserir comportamento da tecla @@ -189,7 +189,7 @@ Suggest names for unresolved identifiers - Suggest names for unresolved identifiers + Sugerir nomes para identificadores não resolvidos diff --git a/vsintegration/src/FSharp.UIResources/xlf/Strings.ru.xlf b/vsintegration/src/FSharp.UIResources/xlf/Strings.ru.xlf index 3ffc77cb300..11f53ed12aa 100644 --- a/vsintegration/src/FSharp.UIResources/xlf/Strings.ru.xlf +++ b/vsintegration/src/FSharp.UIResources/xlf/Strings.ru.xlf @@ -164,22 +164,22 @@ Always add new line on enter - Always add new line on enter + Всегда добавлять новую строку при нажатии клавиши ВВОД Never add new line on enter - Never add new line on enter + Никогда не добавлять новую строку при нажатии клавиши ВВОД Only add new line on enter after end of fully typed word - Only add new line on enter after end of fully typed word + Добавлять только новую строку при нажатии клавиши ВВОД после полностью введенного слова Enter key behavior - Enter key behavior + Действие при нажатии клавиши ВВОД @@ -189,7 +189,7 @@ Suggest names for unresolved identifiers - Suggest names for unresolved identifiers + Предлагать имена для неразрешенных идентификаторов diff --git a/vsintegration/src/FSharp.UIResources/xlf/Strings.tr.xlf b/vsintegration/src/FSharp.UIResources/xlf/Strings.tr.xlf index eb49132788c..fc87f84a73a 100644 --- a/vsintegration/src/FSharp.UIResources/xlf/Strings.tr.xlf +++ b/vsintegration/src/FSharp.UIResources/xlf/Strings.tr.xlf @@ -164,22 +164,22 @@ Always add new line on enter - Always add new line on enter + Enter'a basıldığında her zaman yeni satır ekle Never add new line on enter - Never add new line on enter + Enter'a basıldığında hiçbir zaman yeni satır ekleme Only add new line on enter after end of fully typed word - Only add new line on enter after end of fully typed word + Yalnızca tam olarak yazılmış bir kelimeden sonra Enter'a basıldığında yeni satır ekle Enter key behavior - Enter key behavior + Enter tuşu davranışı @@ -189,7 +189,7 @@ Suggest names for unresolved identifiers - Suggest names for unresolved identifiers + Çözümlenmemiş tanımlayıcılar için ad öner diff --git a/vsintegration/src/FSharp.UIResources/xlf/Strings.zh-Hans.xlf b/vsintegration/src/FSharp.UIResources/xlf/Strings.zh-Hans.xlf index 40f88fd1a83..17f3090936d 100644 --- a/vsintegration/src/FSharp.UIResources/xlf/Strings.zh-Hans.xlf +++ b/vsintegration/src/FSharp.UIResources/xlf/Strings.zh-Hans.xlf @@ -164,22 +164,22 @@ Always add new line on enter - Always add new line on enter + 始终在点击回车时时添加新行 Never add new line on enter - Never add new line on enter + 永远不要在点击回车后添加新行 Only add new line on enter after end of fully typed word - Only add new line on enter after end of fully typed word + 只在键入完整的单词后点击回车后才添加新行 Enter key behavior - Enter key behavior + 回车键的行为 @@ -189,7 +189,7 @@ Suggest names for unresolved identifiers - Suggest names for unresolved identifiers + 为未解析标识符建议名称 diff --git a/vsintegration/src/FSharp.UIResources/xlf/Strings.zh-Hant.xlf b/vsintegration/src/FSharp.UIResources/xlf/Strings.zh-Hant.xlf index 3230b341afc..a17f37f491c 100644 --- a/vsintegration/src/FSharp.UIResources/xlf/Strings.zh-Hant.xlf +++ b/vsintegration/src/FSharp.UIResources/xlf/Strings.zh-Hant.xlf @@ -164,22 +164,22 @@ Always add new line on enter - Always add new line on enter + 一律在按 ENTER 時新增新行 Never add new line on enter - Never add new line on enter + 一律不在按 ENTER 時新增新行 Only add new line on enter after end of fully typed word - Only add new line on enter after end of fully typed word + 只在完整鍵入字的結尾處按 ENTER 來新增新行 Enter key behavior - Enter key behavior + ENTER 鍵行為 @@ -189,7 +189,7 @@ Suggest names for unresolved identifiers - Suggest names for unresolved identifiers + 為未解析的識別碼建議名稱 diff --git a/vsintegration/src/FSharp.VS.FSI/sessions.fs b/vsintegration/src/FSharp.VS.FSI/sessions.fs index 35744a899e9..70aeeb9e404 100644 --- a/vsintegration/src/FSharp.VS.FSI/sessions.fs +++ b/vsintegration/src/FSharp.VS.FSI/sessions.fs @@ -66,7 +66,7 @@ let timeoutApp descr timeoutMS (f : 'a -> 'b) (arg:'a) = !r module SessionsProperties = - let mutable useAnyCpuVersion = false + let mutable useAnyCpuVersion = true // 64-bit by default let mutable fsiArgs = "--optimize" let mutable fsiShadowCopy = true let mutable fsiDebugMode = false diff --git a/vsintegration/src/FSharp.VS.FSI/xlf/Properties.ko.xlf b/vsintegration/src/FSharp.VS.FSI/xlf/Properties.ko.xlf index ce1e4006ca0..b030fad5e50 100644 --- a/vsintegration/src/FSharp.VS.FSI/xlf/Properties.ko.xlf +++ b/vsintegration/src/FSharp.VS.FSI/xlf/Properties.ko.xlf @@ -24,7 +24,7 @@ Misc - Misc + 기타 diff --git a/vsintegration/src/FSharp.VS.FSI/xlf/Properties.pl.xlf b/vsintegration/src/FSharp.VS.FSI/xlf/Properties.pl.xlf index bf088f12e9e..48e1694269a 100644 --- a/vsintegration/src/FSharp.VS.FSI/xlf/Properties.pl.xlf +++ b/vsintegration/src/FSharp.VS.FSI/xlf/Properties.pl.xlf @@ -24,7 +24,7 @@ Misc - Misc + Różne diff --git a/vsintegration/src/FSharp.VS.FSI/xlf/Properties.tr.xlf b/vsintegration/src/FSharp.VS.FSI/xlf/Properties.tr.xlf index 2e7e6834528..6c10979e7ba 100644 --- a/vsintegration/src/FSharp.VS.FSI/xlf/Properties.tr.xlf +++ b/vsintegration/src/FSharp.VS.FSI/xlf/Properties.tr.xlf @@ -24,7 +24,7 @@ Misc - Misc + Çeşitli diff --git a/vsintegration/tests/UnitTests/LegacyLanguageService/Tests.LanguageService.ParameterInfo.fs b/vsintegration/tests/UnitTests/LegacyLanguageService/Tests.LanguageService.ParameterInfo.fs index 058fe998a13..58b58c6cc5d 100644 --- a/vsintegration/tests/UnitTests/LegacyLanguageService/Tests.LanguageService.ParameterInfo.fs +++ b/vsintegration/tests/UnitTests/LegacyLanguageService/Tests.LanguageService.ParameterInfo.fs @@ -1278,85 +1278,6 @@ We really need to rewrite some code paths here to use the real parse tree rather arr.[1] <- ^System.Int32.Parse^(^$ namespace^ Other""") - [] - member public this.``LocationOfParams.UnmatchedParens.Bug91609.Ok``() = - this.TestParameterInfoLocationOfParams(""" - let arr = Array.create 4 1 - arr.[1] <- ^System.Int32.Parse^(^$ - let squares3 = () - ^type Expr = class end - let rec Evaluate (env:Map) exp = ()""") - - [] - member public this.``LocationOfParams.UnmatchedParens.Bug91609.AlsoOk``() = - this.TestParameterInfoLocationOfParams(""" - let arr = Array.create 4 1 - arr.[1] <- System.Int32.Parse(int(int(int(^int^(^$ - let squares3 = () - ^type Expr = class end - let rec Evaluate (env:Map) exp = ()""") - - [] - member public this.``LocationOfParams.UnmatchedParens.Bug91609.NowGood``() = - // This case originally failed, by Design, as there is a finite limit to how many unmatched parens we can handle before the parser gives up and fails catastrophically. - // However now that we recover from more kinds of tokens, e.g. OBLOCKEND, we can easily go much much deeper, and so this case (and most practical cases) now succeeds. - this.TestParameterInfoLocationOfParams(""" - let arr = Array.create 4 1 - arr.[1] <- System.Int32.Parse(int(int(int(int(int(int(^int^(^$ - let squares3 = () - ^type Expr = class end - let rec Evaluate (env:Map) exp = ()""") - - [] - member public this.``LocationOfParams.UnmatchedParens.Bug150492.Case1``() = - this.TestParameterInfoLocationOfParams(""" - module Inner = - ^System.Console.Write^(^$ - let y = 4 - ^type Foo() = inherit obj() - [] - do () """) - - [] - member public this.``LocationOfParams.UnmatchedParens.Bug150492.Case2``() = - // like previous test, but with explicit begin-end at module - this.TestParameterInfoLocationOfParams(""" - module Inner = begin - ^System.Console.Write^(^$ - let y = 4 - ^end - type Foo() = inherit obj() - [] - do () """) - - [] - member public this.``LocationOfParams.UnmatchedParens.Bug150492.Case1.WhenExtraModule``() = - this.TestParameterInfoLocationOfParams(""" - module Program - let xxx = 42 - type FooBaz() = class end - module Inner = - ^System.Console.Write^(^$ - let y = 4 - ^type Foo() = inherit obj() - [] - do () """) - - [] - member public this.``LocationOfParams.UnmatchedParens.Bug150492.Case2.OkWhenExtraModule``() = - // like previous test, but with explicit begin-end at module - this.TestParameterInfoLocationOfParams(""" - module Program - let xxx = 42 - type FooBaz() = class end - module Inner = begin - ^System.Console.Write^(^$ - let y = 4 - ^end - type Foo() = inherit obj() - [] - do () """) - [] member this.``LocationOfParams.InheritsClause.Bug192134``() = this.TestParameterInfoLocationOfParams(""" @@ -1396,30 +1317,6 @@ We really need to rewrite some code paths here to use the real parse tree rather while true do ($) """) - [] - member public this.``LocationOfParams.UnmatchedParensBeforeModuleKeyword.Bug245850.Case1a``() = - this.TestParameterInfoLocationOfParams(""" - module Repro = - for a in ^System.Int16.TryParse^(^$ - ^module AA = - let x = 10 """) - - [] - member public this.``LocationOfParams.UnmatchedParensBeforeModuleKeyword.Bug245850.Case1b``() = - this.TestParameterInfoLocationOfParams(""" - module Repro = - for a in ^System.Int16.TryParse^(^"4$2" - ^module AA = - let x = 10 """) - - [] - member public this.``LocationOfParams.UnmatchedParensBeforeModuleKeyword.Bug245850.Case1c``() = - this.TestParameterInfoLocationOfParams(""" - module Repro = - for a in ^System.Int16.TryParse^(^"4$2",^ - ^module AA = - let x = 10 """) - [] member public this.``LocationOfParams.UnmatchedParensBeforeModuleKeyword.Bug245850.Case2a``() = this.TestParameterInfoLocationOfParams(""" @@ -1428,78 +1325,6 @@ We really need to rewrite some code paths here to use the real parse tree rather ^module AA = let x = 10 """) - [] - member public this.``LocationOfParams.UnmatchedParensBeforeModuleKeyword.Bug245850.Case2b``() = - this.TestParameterInfoLocationOfParams(""" - module Repro = - query { for a in ^System.Int16.TryParse^(^"4$2" - ^module AA = - let x = 10 """) - - [] - member public this.``LocationOfParams.UnmatchedParensBeforeModuleKeyword.Bug245850.Case2c``() = - this.TestParameterInfoLocationOfParams(""" - module Repro = - query { for a in ^System.Int16.TryParse^(^"4$2",^ - ^module AA = - let x = 10 """) - - [] - [] - member public this.``LocationOfParams.QueryCustomOperation.Bug222128``() = - this.TestParameterInfoLocationOfParams(""" - type T() = - member x.GetCollection() = [1;2;3;4] - let q2 = query { - for e in T().GetCollection() do - where (e > 250) - ^skip^(^$ - ^} """) - - [] - member public this.``LocationOfParams.QueryCurlies.Bug204150.Case1``() = - this.TestParameterInfoLocationOfParams(""" - type T() = - member x.GetCollection() = [1;2;3;4] - open System.Linq - let q6 = - query { - for E in ^T().GetCollection().Aggregate^(^$ - ^} """) - - [] - member public this.``LocationOfParams.QueryCurlies.Bug204150.Case2``() = - this.TestParameterInfoLocationOfParams(""" - type T() = - member x.GetCollection() = [1;2;3;4] - open System.Linq - let q6 = - query { - for E in ^T().GetCollection().Aggregate^(^42$ - ^} """) - - [] - member public this.``LocationOfParams.QueryCurlies.Bug204150.Case3``() = - this.TestParameterInfoLocationOfParams(""" - type T() = - member x.GetCollection() = [1;2;3;4] - open System.Linq - let q6 = - query { - for E in ^T().GetCollection().Aggregate^(^42,^$ - ^} """) - - [] - member public this.``LocationOfParams.QueryCurlies.Bug204150.Case4``() = - this.TestParameterInfoLocationOfParams(""" - type T() = - member x.GetCollection() = [1;2;3;4] - open System.Linq - let q6 = - query { - for E in ^T().GetCollection().Aggregate^(^42,^ 43$ - ^} """) - (* Tests for type provider static argument parameterinfos ------------------------------------------ *) member public this.TestParameterInfoLocationOfParamsWithVariousSurroundingContexts (testLine:string, ?markAtEnd, ?additionalReferenceAssemblies) = diff --git a/vsintegration/tests/UnitTests/SignatureHelpProviderTests.fs b/vsintegration/tests/UnitTests/SignatureHelpProviderTests.fs index b26f786fabb..ae95db5397f 100644 --- a/vsintegration/tests/UnitTests/SignatureHelpProviderTests.fs +++ b/vsintegration/tests/UnitTests/SignatureHelpProviderTests.fs @@ -66,7 +66,7 @@ System.Console.WriteLine(format="Hello, {0}",arg0="World") ("arg0", Some ("[7..64)", 1, 2, Some "arg0")); ("arg0=", Some ("[7..64)", 1, 2, Some "arg0")); ("World", Some ("[7..64)", 1, 2, Some "arg0")); - (")", None)]); + (")", Some("[7..64)", 0, 2, Some "format"))]); ( """ //2 open System @@ -127,6 +127,8 @@ type foo5 = N1.T //Test case 5 ( """let _ = System.DateTime(""", [("let _ = System.DateTime(", Some ("[8..24)", 0, 0, None)) ]) + ( """let _ = System.DateTime(1L,""", + [("let _ = System.DateTime(1L,", Some ("[8..27)", 1, 2, None )) ]) ] let sb = StringBuilder()