Skip to content

Commit 640d507

Browse files
rneatherwayrneatherway
committed
Merge pull request #13 from rneatherway/col-1-indexed
Adjust for 1-based column indexing
2 parents 916c162 + 8ace17d commit 640d507

File tree

26 files changed

+251
-113
lines changed

26 files changed

+251
-113
lines changed

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,5 +25,6 @@ FSharp.AutoComplete/test/unit/build
2525
packages
2626
.paket/paket.exe
2727

28+
TestResults.xml
2829

2930
.DS_Store

‎FSharp.AutoComplete.sln‎

Lines changed: 11 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -12,43 +12,31 @@ Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "FSharp.CompilerBinding", "F
1212
EndProject
1313
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "FSharp.AutoComplete", "FSharp.AutoComplete\FSharp.AutoComplete.fsproj", "{B6AB4EF3-8F60-41A1-AB0C-851A6DEB169E}"
1414
EndProject
15+
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "FSharp.CompilerBinding.Tests", "FSharp.CompilerBinding.Tests\FSharp.CompilerBinding.Tests.fsproj", "{F5EBDD99-5ED7-4311-A5CB-7CFCE696FF88}"
16+
EndProject
1517
Global
1618
GlobalSection(SolutionConfigurationPlatforms) = preSolution
1719
Debug|Any CPU = Debug|Any CPU
18-
Debug|Mixed Platforms = Debug|Mixed Platforms
19-
Debug|x86 = Debug|x86
2020
Release|Any CPU = Release|Any CPU
21-
Release|Mixed Platforms = Release|Mixed Platforms
22-
Release|x86 = Release|x86
2321
EndGlobalSection
2422
GlobalSection(ProjectConfigurationPlatforms) = postSolution
2523
{88F6940F-D300-474C-B2A7-E2ECD5B04B57}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
2624
{88F6940F-D300-474C-B2A7-E2ECD5B04B57}.Debug|Any CPU.Build.0 = Debug|Any CPU
27-
{88F6940F-D300-474C-B2A7-E2ECD5B04B57}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
28-
{88F6940F-D300-474C-B2A7-E2ECD5B04B57}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
29-
{88F6940F-D300-474C-B2A7-E2ECD5B04B57}.Debug|x86.ActiveCfg = Debug|Any CPU
3025
{88F6940F-D300-474C-B2A7-E2ECD5B04B57}.Release|Any CPU.ActiveCfg = Release|Any CPU
3126
{88F6940F-D300-474C-B2A7-E2ECD5B04B57}.Release|Any CPU.Build.0 = Release|Any CPU
32-
{88F6940F-D300-474C-B2A7-E2ECD5B04B57}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
33-
{88F6940F-D300-474C-B2A7-E2ECD5B04B57}.Release|Mixed Platforms.Build.0 = Release|Any CPU
34-
{88F6940F-D300-474C-B2A7-E2ECD5B04B57}.Release|x86.ActiveCfg = Release|Any CPU
35-
{B6AB4EF3-8F60-41A1-AB0C-851A6DEB169E}.Debug|Any CPU.ActiveCfg = Debug|x86
36-
{B6AB4EF3-8F60-41A1-AB0C-851A6DEB169E}.Debug|Any CPU.Build.0 = Debug|x86
37-
{B6AB4EF3-8F60-41A1-AB0C-851A6DEB169E}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
38-
{B6AB4EF3-8F60-41A1-AB0C-851A6DEB169E}.Debug|Mixed Platforms.Build.0 = Debug|x86
39-
{B6AB4EF3-8F60-41A1-AB0C-851A6DEB169E}.Debug|x86.ActiveCfg = Debug|x86
40-
{B6AB4EF3-8F60-41A1-AB0C-851A6DEB169E}.Debug|x86.Build.0 = Debug|x86
41-
{B6AB4EF3-8F60-41A1-AB0C-851A6DEB169E}.Release|Any CPU.ActiveCfg = Release|x86
42-
{B6AB4EF3-8F60-41A1-AB0C-851A6DEB169E}.Release|Any CPU.Build.0 = Release|x86
43-
{B6AB4EF3-8F60-41A1-AB0C-851A6DEB169E}.Release|Mixed Platforms.ActiveCfg = Release|x86
44-
{B6AB4EF3-8F60-41A1-AB0C-851A6DEB169E}.Release|Mixed Platforms.Build.0 = Release|x86
45-
{B6AB4EF3-8F60-41A1-AB0C-851A6DEB169E}.Release|x86.ActiveCfg = Release|x86
46-
{B6AB4EF3-8F60-41A1-AB0C-851A6DEB169E}.Release|x86.Build.0 = Release|x86
27+
{B6AB4EF3-8F60-41A1-AB0C-851A6DEB169E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
28+
{B6AB4EF3-8F60-41A1-AB0C-851A6DEB169E}.Debug|Any CPU.Build.0 = Debug|Any CPU
29+
{B6AB4EF3-8F60-41A1-AB0C-851A6DEB169E}.Release|Any CPU.ActiveCfg = Release|Any CPU
30+
{B6AB4EF3-8F60-41A1-AB0C-851A6DEB169E}.Release|Any CPU.Build.0 = Release|Any CPU
31+
{F5EBDD99-5ED7-4311-A5CB-7CFCE696FF88}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
32+
{F5EBDD99-5ED7-4311-A5CB-7CFCE696FF88}.Debug|Any CPU.Build.0 = Debug|Any CPU
33+
{F5EBDD99-5ED7-4311-A5CB-7CFCE696FF88}.Release|Any CPU.ActiveCfg = Release|Any CPU
34+
{F5EBDD99-5ED7-4311-A5CB-7CFCE696FF88}.Release|Any CPU.Build.0 = Release|Any CPU
4735
EndGlobalSection
4836
GlobalSection(SolutionProperties) = preSolution
4937
HideSolutionNode = FALSE
5038
EndGlobalSection
5139
GlobalSection(MonoDevelopProperties) = preSolution
52-
StartupItem = FSharp.AutoComplete.fsproj
40+
StartupItem = FSharp.AutoComplete\FSharp.AutoComplete.fsproj
5341
EndGlobalSection
5442
EndGlobal

‎FSharp.AutoComplete/FSharp.AutoComplete.fsproj‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<PropertyGroup>
44
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
5-
<Platform Condition=" '$(Platform)' == '' ">x86</Platform>
5+
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
66
<ProductVersion>8.0.30703</ProductVersion>
77
<SchemaVersion>2.0</SchemaVersion>
88
<ProjectGuid>{B6AB4EF3-8F60-41A1-AB0C-851A6DEB169E}</ProjectGuid>
@@ -17,26 +17,24 @@
1717
<MinimumVisualStudioVersion Condition="'$(MinimumVisualStudioVersion)' == ''">11</MinimumVisualStudioVersion>
1818
<TargetFrameworkProfile />
1919
</PropertyGroup>
20-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
20+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
2121
<DebugSymbols>True</DebugSymbols>
2222
<DebugType>full</DebugType>
2323
<Optimize>False</Optimize>
2424
<Tailcalls>False</Tailcalls>
2525
<OutputPath>bin\Debug</OutputPath>
2626
<DefineConstants>DEBUG;TRACE</DefineConstants>
2727
<WarningLevel>3</WarningLevel>
28-
<PlatformTarget>x86</PlatformTarget>
2928
<DocumentationFile>bin\Debug\FSharp.InteractiveAutocomplete.XML</DocumentationFile>
3029
<OtherFlags>--warnon:1182</OtherFlags>
3130
</PropertyGroup>
32-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
31+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
3332
<DebugType>pdbonly</DebugType>
3433
<Optimize>True</Optimize>
3534
<Tailcalls>True</Tailcalls>
3635
<OutputPath>bin\Release</OutputPath>
3736
<DefineConstants>TRACE</DefineConstants>
3837
<WarningLevel>3</WarningLevel>
39-
<PlatformTarget>x86</PlatformTarget>
4038
<DocumentationFile>bin\Release\FSharp.InteractiveAutocomplete.XML</DocumentationFile>
4139
<DebugSymbols>False</DebugSymbols>
4240
</PropertyGroup>

‎FSharp.AutoComplete/Program.fs‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -273,7 +273,7 @@ module internal CommandInput =
273273
// Parses always and returns default error message
274274
let error = parser { return Error("Unknown command or wrong arguments") }
275275

276-
// Parase any of the supported commands
276+
// Parse any of the supported commands
277277
let parseCommand =
278278
function
279279
| null -> Quit
@@ -390,11 +390,12 @@ module internal Main =
390390
ok
391391

392392
/// Is the specified position consistent with internal state of file?
393-
// Note that both emacs and FSC use 1-based line indexing
393+
// Note that both emacs and FCS use 1-based line indexing
394+
// while emacs uses 0-based column indexing and FCS is 1-based
394395
let posok file line col =
395396
let lines = state.Files.[file].Lines
396397
let ok = line <= lines.Length && line >= 1 &&
397-
col <= lines.[line - 1].Length && col >= 0
398+
col <= lines.[line - 1].Length + 1 && col >= 1
398399
if not ok then printMsg "ERROR" "Position is out of range"
399400
ok
400401

‎FSharp.AutoComplete/test/integration/CompletionFilter/CompletionFilterRunner.fsx‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@ File.Delete "output.txt"
1414
let p = new FSharpAutoCompleteWrapper()
1515

1616
p.parse "Script.fsx"
17-
p.completion "Script.fsx" 2 6
18-
p.completionFilter "Script.fsx" 2 6 "StartsWith"
19-
p.completionFilter "Script.fsx" 2 6 "Contains"
17+
p.completion "Script.fsx" 2 7
18+
p.completionFilter "Script.fsx" 2 7 "StartsWith"
19+
p.completionFilter "Script.fsx" 2 7 "Contains"
2020
p.send "quit\n"
2121
p.finalOutput ()
2222
|> writeNormalizedOutput "output.txt"

‎FSharp.AutoComplete/test/integration/ErrorTests/ErrorsRunner.fsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ let p = new FSharpAutoCompleteWrapper()
1010

1111
p.project "Test1.fsproj"
1212
p.parse "Program.fs"
13-
p.completion "Program.fs" 6 13
13+
p.completion "Program.fs" 6 14
1414
p.parse "Script.fsx"
15-
p.completion "Script.fsx" 6 13
15+
p.completion "Script.fsx" 6 14
1616
p.send "quit\n"
1717
p.finalOutput ()
1818
|> writeNormalizedOutput "output.txt"

‎FSharp.AutoComplete/test/integration/ErrorTestsJson/ErrorsRunner.fsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ p.project "Test1.fsproj"
1313
p.parse "Program.fs"
1414
p.parse "Script.fsx"
1515
Threading.Thread.Sleep(8000)
16-
p.completion "Program.fs" 6 13
17-
p.completion "Script.fsx" 6 13
16+
p.completion "Program.fs" 6 14
17+
p.completion "Script.fsx" 6 14
1818
p.send "quit\n"
1919
p.finalOutput ()
2020
|> writeNormalizedOutput "output.json"

‎FSharp.AutoComplete/test/integration/FindDeclarations/FindDeclRunner.fsx‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@ p.project "FindDecl.fsproj"
1717
p.parse "FileTwo.fs"
1818
p.parse "Script.fsx"
1919
p.parse "Program.fs"
20-
p.finddeclaration "Program.fs" 6 15
21-
p.finddeclaration "Program.fs" 8 19
22-
p.finddeclaration "Program.fs" 14 25
23-
p.finddeclaration "Program.fs" 10 19
24-
p.finddeclaration "Script.fsx" 6 16
20+
p.finddeclaration "Program.fs" 6 16
21+
p.finddeclaration "Program.fs" 8 20
22+
p.finddeclaration "Program.fs" 14 26
23+
p.finddeclaration "Program.fs" 10 20
24+
p.finddeclaration "Script.fsx" 6 17
2525
p.send "quit\n"
2626
p.finalOutput ()
2727
|> writeNormalizedOutput "output.txt"

‎FSharp.AutoComplete/test/integration/MultiProj/MultiProjRunner.fsx‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -11,32 +11,32 @@ let p = new FSharpAutoCompleteWrapper()
1111
p.project "Proj1/Proj1.fsproj"
1212
p.parse "Proj1/Ops.fs"
1313
p.parse "Proj1/Program.fs"
14-
p.completion "Proj1/Program.fs" 8 19
15-
p.completion "Proj1/Program.fs" 4 22
16-
p.completion "Proj1/Program.fs" 6 13
17-
p.completion "Proj1/Program.fs" 10 19
14+
p.completion "Proj1/Program.fs" 8 20
15+
p.completion "Proj1/Program.fs" 4 23
16+
p.completion "Proj1/Program.fs" 6 14
17+
p.completion "Proj1/Program.fs" 10 20
1818

1919
p.project "Proj2/Proj2.fsproj"
2020
p.parse "Proj2/Core.fs"
2121
p.parse "Proj2/Program.fs"
22-
p.completion "Proj2/Program.fs" 8 19
23-
p.completion "Proj2/Program.fs" 4 22
24-
p.completion "Proj2/Program.fs" 6 13
25-
p.completion "Proj2/Program.fs" 10 19
22+
p.completion "Proj2/Program.fs" 8 20
23+
p.completion "Proj2/Program.fs" 4 23
24+
p.completion "Proj2/Program.fs" 6 14
25+
p.completion "Proj2/Program.fs" 10 20
2626

2727
p.parse "Proj1/Ops.fs"
2828
p.parse "Proj1/Program.fs"
29-
p.completion "Proj1/Program.fs" 8 19
30-
p.completion "Proj1/Program.fs" 4 22
31-
p.completion "Proj1/Program.fs" 6 13
32-
p.completion "Proj1/Program.fs" 10 19
29+
p.completion "Proj1/Program.fs" 8 20
30+
p.completion "Proj1/Program.fs" 4 23
31+
p.completion "Proj1/Program.fs" 6 14
32+
p.completion "Proj1/Program.fs" 10 20
3333

3434
p.parse "Proj2/Core.fs"
3535
p.parse "Proj2/Program.fs"
36-
p.completion "Proj2/Program.fs" 8 19
37-
p.completion "Proj2/Program.fs" 4 22
38-
p.completion "Proj2/Program.fs" 6 13
39-
p.completion "Proj2/Program.fs" 10 19
36+
p.completion "Proj2/Program.fs" 8 20
37+
p.completion "Proj2/Program.fs" 4 23
38+
p.completion "Proj2/Program.fs" 6 14
39+
p.completion "Proj2/Program.fs" 10 20
4040

4141
p.send "quit\n"
4242
p.finalOutput ()

‎FSharp.AutoComplete/test/integration/OutOfRange/OutOfRangeRunner.fsx‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,16 +14,16 @@ File.Delete "output.txt"
1414
let p = new FSharpAutoCompleteWrapper()
1515

1616
p.parse "Script.fsx"
17+
p.completion "Script.fsx" 6 17
1718
p.completion "Script.fsx" 6 16
18-
p.completion "Script.fsx" 6 15
19-
p.tooltip "Script.fsx" 6 13
2019
p.tooltip "Script.fsx" 6 14
2120
p.tooltip "Script.fsx" 6 15
2221
p.tooltip "Script.fsx" 6 16
23-
p.finddeclaration "Script.fsx" 6 13
22+
p.tooltip "Script.fsx" 6 17
2423
p.finddeclaration "Script.fsx" 6 14
2524
p.finddeclaration "Script.fsx" 6 15
2625
p.finddeclaration "Script.fsx" 6 16
26+
p.finddeclaration "Script.fsx" 6 17
2727

2828
p.send "quit\n"
2929
p.finalOutput ()

0 commit comments

Comments
 (0)