diff --git a/src/libraries/Microsoft.PowerFx.Core/App/Controls/IExternalRule.cs b/src/libraries/Microsoft.PowerFx.Core/App/Controls/IExternalRule.cs index fc81c185a1..ed0902f016 100644 --- a/src/libraries/Microsoft.PowerFx.Core/App/Controls/IExternalRule.cs +++ b/src/libraries/Microsoft.PowerFx.Core/App/Controls/IExternalRule.cs @@ -6,7 +6,7 @@ using Microsoft.PowerFx.Core.Entities.QueryOptions; using Microsoft.PowerFx.Core.Functions; using Microsoft.PowerFx.Core.Logging.Trackers; -using Microsoft.PowerFx.Core.Syntax.Nodes; +using Microsoft.PowerFx.Syntax; namespace Microsoft.PowerFx.Core.App.Controls { diff --git a/src/libraries/Microsoft.PowerFx.Core/App/ErrorContainers/ErrorContainer.cs b/src/libraries/Microsoft.PowerFx.Core/App/ErrorContainers/ErrorContainer.cs index ce69245a56..d499bfba32 100644 --- a/src/libraries/Microsoft.PowerFx.Core/App/ErrorContainers/ErrorContainer.cs +++ b/src/libraries/Microsoft.PowerFx.Core/App/ErrorContainers/ErrorContainer.cs @@ -4,9 +4,9 @@ using System.Collections.Generic; using Microsoft.PowerFx.Core.Errors; using Microsoft.PowerFx.Core.Localization; -using Microsoft.PowerFx.Core.Syntax.Nodes; using Microsoft.PowerFx.Core.Types; using Microsoft.PowerFx.Core.Utils; +using Microsoft.PowerFx.Syntax; namespace Microsoft.PowerFx.Core.App.ErrorContainers { diff --git a/src/libraries/Microsoft.PowerFx.Core/App/ErrorContainers/IErrorContainer.cs b/src/libraries/Microsoft.PowerFx.Core/App/ErrorContainers/IErrorContainer.cs index f6caa8202b..120f17e5a8 100644 --- a/src/libraries/Microsoft.PowerFx.Core/App/ErrorContainers/IErrorContainer.cs +++ b/src/libraries/Microsoft.PowerFx.Core/App/ErrorContainers/IErrorContainer.cs @@ -4,8 +4,8 @@ using System.Collections.Generic; using Microsoft.PowerFx.Core.Errors; using Microsoft.PowerFx.Core.Localization; -using Microsoft.PowerFx.Core.Syntax.Nodes; using Microsoft.PowerFx.Core.Types; +using Microsoft.PowerFx.Syntax; namespace Microsoft.PowerFx.Core.App.ErrorContainers { diff --git a/src/libraries/Microsoft.PowerFx.Core/App/ErrorContainers/LimitedSeverityErrorContainer.cs b/src/libraries/Microsoft.PowerFx.Core/App/ErrorContainers/LimitedSeverityErrorContainer.cs index 4245c9c589..c6790d1882 100644 --- a/src/libraries/Microsoft.PowerFx.Core/App/ErrorContainers/LimitedSeverityErrorContainer.cs +++ b/src/libraries/Microsoft.PowerFx.Core/App/ErrorContainers/LimitedSeverityErrorContainer.cs @@ -4,8 +4,8 @@ using System.Collections.Generic; using Microsoft.PowerFx.Core.Errors; using Microsoft.PowerFx.Core.Localization; -using Microsoft.PowerFx.Core.Syntax.Nodes; using Microsoft.PowerFx.Core.Types; +using Microsoft.PowerFx.Syntax; namespace Microsoft.PowerFx.Core.App.ErrorContainers { diff --git a/src/libraries/Microsoft.PowerFx.Core/Binding/BindInfo/AsInfo.cs b/src/libraries/Microsoft.PowerFx.Core/Binding/BindInfo/AsInfo.cs index 2c7f2377e5..0207286064 100644 --- a/src/libraries/Microsoft.PowerFx.Core/Binding/BindInfo/AsInfo.cs +++ b/src/libraries/Microsoft.PowerFx.Core/Binding/BindInfo/AsInfo.cs @@ -1,8 +1,8 @@ // Copyright (c) Microsoft Corporation. // Licensed under the MIT license. -using Microsoft.PowerFx.Core.Syntax.Nodes; using Microsoft.PowerFx.Core.Utils; +using Microsoft.PowerFx.Syntax; namespace Microsoft.PowerFx.Core.Binding.BindInfo { @@ -20,4 +20,4 @@ public AsInfo(AsNode node, DName identifier) Node = node; } } -} \ No newline at end of file +} diff --git a/src/libraries/Microsoft.PowerFx.Core/Binding/BindInfo/CallInfo.cs b/src/libraries/Microsoft.PowerFx.Core/Binding/BindInfo/CallInfo.cs index 0ea436581c..b4435f12f5 100644 --- a/src/libraries/Microsoft.PowerFx.Core/Binding/BindInfo/CallInfo.cs +++ b/src/libraries/Microsoft.PowerFx.Core/Binding/BindInfo/CallInfo.cs @@ -3,9 +3,9 @@ using System; using Microsoft.PowerFx.Core.Functions; -using Microsoft.PowerFx.Core.Syntax.Nodes; using Microsoft.PowerFx.Core.Types; using Microsoft.PowerFx.Core.Utils; +using Microsoft.PowerFx.Syntax; namespace Microsoft.PowerFx.Core.Binding.BindInfo { @@ -72,4 +72,4 @@ public CallInfo(TexlFunction function, CallNode node, DType cursorType, DName sc RequiresScopeIdentifier = requiresScopeIdentifier; } } -} \ No newline at end of file +} diff --git a/src/libraries/Microsoft.PowerFx.Core/Binding/BindInfo/ControlKeywordInfo.cs b/src/libraries/Microsoft.PowerFx.Core/Binding/BindInfo/ControlKeywordInfo.cs index 5619b5c22d..ed00fb91e5 100644 --- a/src/libraries/Microsoft.PowerFx.Core/Binding/BindInfo/ControlKeywordInfo.cs +++ b/src/libraries/Microsoft.PowerFx.Core/Binding/BindInfo/ControlKeywordInfo.cs @@ -2,8 +2,8 @@ // Licensed under the MIT license. using Microsoft.PowerFx.Core.App.Controls; -using Microsoft.PowerFx.Core.Syntax.Nodes; using Microsoft.PowerFx.Core.Utils; +using Microsoft.PowerFx.Syntax; namespace Microsoft.PowerFx.Core.Binding.BindInfo { @@ -25,4 +25,4 @@ public ControlKeywordInfo(NameNode node, DPath path, IExternalControl data) Data = data; } } -} \ No newline at end of file +} diff --git a/src/libraries/Microsoft.PowerFx.Core/Binding/BindInfo/DottedNameInfo.cs b/src/libraries/Microsoft.PowerFx.Core/Binding/BindInfo/DottedNameInfo.cs index 7d2746af95..4c41418a9d 100644 --- a/src/libraries/Microsoft.PowerFx.Core/Binding/BindInfo/DottedNameInfo.cs +++ b/src/libraries/Microsoft.PowerFx.Core/Binding/BindInfo/DottedNameInfo.cs @@ -1,8 +1,8 @@ // Copyright (c) Microsoft Corporation. // Licensed under the MIT license. -using Microsoft.PowerFx.Core.Syntax.Nodes; using Microsoft.PowerFx.Core.Utils; +using Microsoft.PowerFx.Syntax; namespace Microsoft.PowerFx.Core.Binding.BindInfo { @@ -22,4 +22,4 @@ public DottedNameInfo(DottedNameNode node, object data = null) Data = data; } } -} \ No newline at end of file +} diff --git a/src/libraries/Microsoft.PowerFx.Core/Binding/BindInfo/FirstNameInfo.cs b/src/libraries/Microsoft.PowerFx.Core/Binding/BindInfo/FirstNameInfo.cs index ffa543f47d..357cd071e8 100644 --- a/src/libraries/Microsoft.PowerFx.Core/Binding/BindInfo/FirstNameInfo.cs +++ b/src/libraries/Microsoft.PowerFx.Core/Binding/BindInfo/FirstNameInfo.cs @@ -5,9 +5,9 @@ using System.Collections.Generic; using Microsoft.PowerFx.Core.App.Controls; using Microsoft.PowerFx.Core.Entities.QueryOptions; -using Microsoft.PowerFx.Core.Syntax.Nodes; using Microsoft.PowerFx.Core.Types; using Microsoft.PowerFx.Core.Utils; +using Microsoft.PowerFx.Syntax; namespace Microsoft.PowerFx.Core.Binding.BindInfo { @@ -126,4 +126,4 @@ public static FirstNameInfo Create(BindKind kind, FirstNameNode node, int nestDs return new FirstNameInfo(kind, node, nestDst, nestSrc, DPath.Root, data, default, false); } } -} \ No newline at end of file +} diff --git a/src/libraries/Microsoft.PowerFx.Core/Binding/BindInfo/NameInfo.cs b/src/libraries/Microsoft.PowerFx.Core/Binding/BindInfo/NameInfo.cs index 7c2352f2e3..9c957014f0 100644 --- a/src/libraries/Microsoft.PowerFx.Core/Binding/BindInfo/NameInfo.cs +++ b/src/libraries/Microsoft.PowerFx.Core/Binding/BindInfo/NameInfo.cs @@ -1,8 +1,8 @@ // Copyright (c) Microsoft Corporation. // Licensed under the MIT license. -using Microsoft.PowerFx.Core.Syntax.Nodes; using Microsoft.PowerFx.Core.Utils; +using Microsoft.PowerFx.Syntax; namespace Microsoft.PowerFx.Core.Binding.BindInfo { diff --git a/src/libraries/Microsoft.PowerFx.Core/Binding/BindInfo/ParentInfo.cs b/src/libraries/Microsoft.PowerFx.Core/Binding/BindInfo/ParentInfo.cs index bff151ea24..017a56422b 100644 --- a/src/libraries/Microsoft.PowerFx.Core/Binding/BindInfo/ParentInfo.cs +++ b/src/libraries/Microsoft.PowerFx.Core/Binding/BindInfo/ParentInfo.cs @@ -2,9 +2,8 @@ // Licensed under the MIT license. using Microsoft.PowerFx.Core.App.Controls; -using Microsoft.PowerFx.Core.Lexer; -using Microsoft.PowerFx.Core.Syntax.Nodes; using Microsoft.PowerFx.Core.Utils; +using Microsoft.PowerFx.Syntax; namespace Microsoft.PowerFx.Core.Binding.BindInfo { @@ -20,4 +19,4 @@ public ParentInfo(ParentNode node, DPath path, IExternalControl data) { } } -} \ No newline at end of file +} diff --git a/src/libraries/Microsoft.PowerFx.Core/Binding/BindInfo/SelfInfo.cs b/src/libraries/Microsoft.PowerFx.Core/Binding/BindInfo/SelfInfo.cs index 8ddf4d9b63..2f7f207722 100644 --- a/src/libraries/Microsoft.PowerFx.Core/Binding/BindInfo/SelfInfo.cs +++ b/src/libraries/Microsoft.PowerFx.Core/Binding/BindInfo/SelfInfo.cs @@ -2,9 +2,8 @@ // Licensed under the MIT license. using Microsoft.PowerFx.Core.App.Controls; -using Microsoft.PowerFx.Core.Lexer; -using Microsoft.PowerFx.Core.Syntax.Nodes; using Microsoft.PowerFx.Core.Utils; +using Microsoft.PowerFx.Syntax; namespace Microsoft.PowerFx.Core.Binding.BindInfo { @@ -20,4 +19,4 @@ public SelfInfo(SelfNode node, DPath path, IExternalControl data) { } } -} \ No newline at end of file +} diff --git a/src/libraries/Microsoft.PowerFx.Core/Binding/Binder.cs b/src/libraries/Microsoft.PowerFx.Core/Binding/Binder.cs index 64c56bfcf1..2910065850 100644 --- a/src/libraries/Microsoft.PowerFx.Core/Binding/Binder.cs +++ b/src/libraries/Microsoft.PowerFx.Core/Binding/Binder.cs @@ -17,15 +17,12 @@ using Microsoft.PowerFx.Core.Functions; using Microsoft.PowerFx.Core.Functions.Delegation; using Microsoft.PowerFx.Core.Glue; -using Microsoft.PowerFx.Core.Lexer; -using Microsoft.PowerFx.Core.Lexer.Tokens; using Microsoft.PowerFx.Core.Localization; -using Microsoft.PowerFx.Core.Syntax; -using Microsoft.PowerFx.Core.Syntax.Nodes; -using Microsoft.PowerFx.Core.Syntax.Visitors; using Microsoft.PowerFx.Core.Texl; using Microsoft.PowerFx.Core.Types; using Microsoft.PowerFx.Core.Utils; +using Microsoft.PowerFx.Syntax; +using Microsoft.PowerFx.Types; using Conditional = System.Diagnostics.ConditionalAttribute; namespace Microsoft.PowerFx.Core.Binding @@ -5790,7 +5787,7 @@ public override void PostVisit(TableNode node) _txb.SetType( node, - exprType.IsValid ? DType.CreateTable(new TypedName(exprType, Public.Values.TableValue.ValueDName)) : DType.EmptyTable); + exprType.IsValid ? DType.CreateTable(new TypedName(exprType, TableValue.ValueDName)) : DType.EmptyTable); SetVariadicNodePurity(node); _txb.SetScopeUseSet(node, JoinScopeUseSets(node.Children)); _txb.SetSelfContainedConstant(node, isSelfContainedConstant); diff --git a/src/libraries/Microsoft.PowerFx.Core/Binding/BinderNodesMetadataArgTypeVisitor.cs b/src/libraries/Microsoft.PowerFx.Core/Binding/BinderNodesMetadataArgTypeVisitor.cs index 3d87a4df8a..a3255bad21 100644 --- a/src/libraries/Microsoft.PowerFx.Core/Binding/BinderNodesMetadataArgTypeVisitor.cs +++ b/src/libraries/Microsoft.PowerFx.Core/Binding/BinderNodesMetadataArgTypeVisitor.cs @@ -5,10 +5,9 @@ using Microsoft.PowerFx.Core.Binding.BindInfo; using Microsoft.PowerFx.Core.Entities; using Microsoft.PowerFx.Core.Localization; -using Microsoft.PowerFx.Core.Syntax; -using Microsoft.PowerFx.Core.Syntax.Nodes; using Microsoft.PowerFx.Core.Types; using Microsoft.PowerFx.Core.Utils; +using Microsoft.PowerFx.Syntax; namespace Microsoft.PowerFx.Core.Binding { diff --git a/src/libraries/Microsoft.PowerFx.Core/Binding/BinderNodesVisitor.cs b/src/libraries/Microsoft.PowerFx.Core/Binding/BinderNodesVisitor.cs index 239b12f60d..aee7bd7d53 100644 --- a/src/libraries/Microsoft.PowerFx.Core/Binding/BinderNodesVisitor.cs +++ b/src/libraries/Microsoft.PowerFx.Core/Binding/BinderNodesVisitor.cs @@ -2,11 +2,8 @@ // Licensed under the MIT license. using System.Collections.Generic; -using Microsoft.PowerFx.Core.Lexer; -using Microsoft.PowerFx.Core.Syntax; -using Microsoft.PowerFx.Core.Syntax.Nodes; -using Microsoft.PowerFx.Core.Syntax.Visitors; using Microsoft.PowerFx.Core.Utils; +using Microsoft.PowerFx.Syntax; namespace Microsoft.PowerFx.Core.Binding { diff --git a/src/libraries/Microsoft.PowerFx.Core/Binding/BinderUtils.cs b/src/libraries/Microsoft.PowerFx.Core/Binding/BinderUtils.cs index 2a4ff288bf..4113eba7ff 100644 --- a/src/libraries/Microsoft.PowerFx.Core/Binding/BinderUtils.cs +++ b/src/libraries/Microsoft.PowerFx.Core/Binding/BinderUtils.cs @@ -3,8 +3,8 @@ using Microsoft.PowerFx.Core.Functions; using Microsoft.PowerFx.Core.Logging.Trackers; -using Microsoft.PowerFx.Core.Syntax.Nodes; using Microsoft.PowerFx.Core.Utils; +using Microsoft.PowerFx.Syntax; namespace Microsoft.PowerFx.Core.Binding { diff --git a/src/libraries/Microsoft.PowerFx.Core/Entities/External/IExternalEntityScope.cs b/src/libraries/Microsoft.PowerFx.Core/Entities/External/IExternalEntityScope.cs index 31141ec86c..c742422343 100644 --- a/src/libraries/Microsoft.PowerFx.Core/Entities/External/IExternalEntityScope.cs +++ b/src/libraries/Microsoft.PowerFx.Core/Entities/External/IExternalEntityScope.cs @@ -2,9 +2,9 @@ // Licensed under the MIT license. using System.Collections.Generic; -using Microsoft.PowerFx.Core.Syntax.Nodes; using Microsoft.PowerFx.Core.Types; using Microsoft.PowerFx.Core.Utils; +using Microsoft.PowerFx.Syntax; namespace Microsoft.PowerFx.Core.Entities { @@ -38,4 +38,4 @@ public static bool TryGetDataSource(this IExternalEntityScope entityScope, TexlN return entityScope.TryGetEntity(firstNameNode.Ident.Name, out dataSourceInfo); } } -} \ No newline at end of file +} diff --git a/src/libraries/Microsoft.PowerFx.Core/Entities/External/IExternalOptionSet.cs b/src/libraries/Microsoft.PowerFx.Core/Entities/External/IExternalOptionSet.cs index 9c43ad2fb3..af1b781429 100644 --- a/src/libraries/Microsoft.PowerFx.Core/Entities/External/IExternalOptionSet.cs +++ b/src/libraries/Microsoft.PowerFx.Core/Entities/External/IExternalOptionSet.cs @@ -2,9 +2,8 @@ // Licensed under the MIT license. using System.Collections.Generic; -using Microsoft.PowerFx.Core.Public.Values; -using Microsoft.PowerFx.Core.Types; using Microsoft.PowerFx.Core.Utils; +using Microsoft.PowerFx.Types; namespace Microsoft.PowerFx.Core.Entities { diff --git a/src/libraries/Microsoft.PowerFx.Core/Errors/DocumentErrorSeverity.cs b/src/libraries/Microsoft.PowerFx.Core/Errors/DocumentErrorSeverity.cs index 8c667b6972..7763e3136e 100644 --- a/src/libraries/Microsoft.PowerFx.Core/Errors/DocumentErrorSeverity.cs +++ b/src/libraries/Microsoft.PowerFx.Core/Errors/DocumentErrorSeverity.cs @@ -6,10 +6,12 @@ namespace Microsoft.PowerFx.Core.Errors { /// + /// Internal error code - part of Transport Layer and used by Canvas Apps. + /// See for public facing type. /// Severity of errors provided. /// [TransportType(TransportKind.Enum)] - public enum DocumentErrorSeverity + internal enum DocumentErrorSeverity { #pragma warning disable SA1300 // Element should begin with upper-case letter _Min = Verbose, diff --git a/src/libraries/Microsoft.PowerFx.Core/Errors/ErrorSeverity.cs b/src/libraries/Microsoft.PowerFx.Core/Errors/ErrorSeverity.cs new file mode 100644 index 0000000000..f01f0c1750 --- /dev/null +++ b/src/libraries/Microsoft.PowerFx.Core/Errors/ErrorSeverity.cs @@ -0,0 +1,62 @@ +// Copyright (c) Microsoft Corporation. +// Licensed under the MIT license. + +namespace Microsoft.PowerFx +{ + /// + /// Severity of errors provided. + /// + public enum ErrorSeverity + { + // These values are a mirror of Microsoft.PowerFx.Core.Errors.DocumentErrorSeverity, + // which is an internal type with [TransportType] attribute. + +#pragma warning disable SA1300 // Element should begin with upper-case letter + _Min = Verbose, +#pragma warning restore SA1300 // Element should begin with upper-case letter + + /// + /// A suggestion about possible high-level improvements or refactoring that may help the user + /// get a better app experience. + /// Examples: performance changes + /// + Verbose = 0, + + /// + /// A suggestion about possible improvements or refactoring that may help the user + /// get a better app experience. + /// Examples: refactoring suggestions. + /// + Suggestion, + + /// + /// A warning about a potential problem. These will typically not prevent normal rule execution. + /// Examples: certain type errors/warnings. + /// + Warning, + + /// + /// A moderate error that may prevent rules from executing properly. + /// Examples: Service unavailable, service schema changed. + /// + Moderate, + + /// + /// A severe error that will likely prevent rules from executing properly. + /// This type of errors prevents generation of code and publishing. + /// Examples: invocation of unknown functions, invalid names, certain type errors. + /// + Severe, + + /// + /// A critical error, e.g. an error that prevents rules from executing properly. + /// This type of errors prevent generation of code and publishing. + /// Example: syntax errors. + /// + Critical, + +#pragma warning disable SA1300 // Element should begin with upper-case letter + _Lim = Critical, +#pragma warning restore SA1300 // Element should begin with upper-case letter + } +} diff --git a/src/libraries/Microsoft.PowerFx.Core/Errors/TexlError.cs b/src/libraries/Microsoft.PowerFx.Core/Errors/TexlError.cs index 35b490156c..632a4d977b 100644 --- a/src/libraries/Microsoft.PowerFx.Core/Errors/TexlError.cs +++ b/src/libraries/Microsoft.PowerFx.Core/Errors/TexlError.cs @@ -4,10 +4,9 @@ using System.Collections.Generic; using System.Globalization; using System.Text; -using Microsoft.PowerFx.Core.Lexer.Tokens; using Microsoft.PowerFx.Core.Localization; -using Microsoft.PowerFx.Core.Syntax.Nodes; using Microsoft.PowerFx.Core.Utils; +using Microsoft.PowerFx.Syntax; namespace Microsoft.PowerFx.Core.Errors { diff --git a/src/libraries/Microsoft.PowerFx.Core/FeatureFlags.cs b/src/libraries/Microsoft.PowerFx.Core/FeatureFlags.cs index 98294eba90..3ded5fdfa9 100644 --- a/src/libraries/Microsoft.PowerFx.Core/FeatureFlags.cs +++ b/src/libraries/Microsoft.PowerFx.Core/FeatureFlags.cs @@ -3,7 +3,7 @@ using System; -namespace Microsoft.PowerFx +namespace Microsoft.PowerFx.Preview { /// /// Hosts can enable these flags to try out early features. diff --git a/src/libraries/Microsoft.PowerFx.Core/Functions/DefaultNoOpErrorContainer.cs b/src/libraries/Microsoft.PowerFx.Core/Functions/DefaultNoOpErrorContainer.cs index f2b3c159a6..d11a318d35 100644 --- a/src/libraries/Microsoft.PowerFx.Core/Functions/DefaultNoOpErrorContainer.cs +++ b/src/libraries/Microsoft.PowerFx.Core/Functions/DefaultNoOpErrorContainer.cs @@ -5,8 +5,8 @@ using Microsoft.PowerFx.Core.App.ErrorContainers; using Microsoft.PowerFx.Core.Errors; using Microsoft.PowerFx.Core.Localization; -using Microsoft.PowerFx.Core.Syntax.Nodes; using Microsoft.PowerFx.Core.Types; +using Microsoft.PowerFx.Syntax; namespace Microsoft.PowerFx.Core.Functions { @@ -41,4 +41,4 @@ public void Errors(TexlNode node, DType nodeType, KeyValuePair sc // Do nothing. } } -} \ No newline at end of file +} diff --git a/src/libraries/Microsoft.PowerFx.Core/Functions/Delegation/DelegationCapability.cs b/src/libraries/Microsoft.PowerFx.Core/Functions/Delegation/DelegationCapability.cs index 5ce5d5970d..565a7eb97d 100644 --- a/src/libraries/Microsoft.PowerFx.Core/Functions/Delegation/DelegationCapability.cs +++ b/src/libraries/Microsoft.PowerFx.Core/Functions/Delegation/DelegationCapability.cs @@ -4,8 +4,8 @@ using System; using System.Collections.Generic; using System.Numerics; -using Microsoft.PowerFx.Core.Lexer; using Microsoft.PowerFx.Core.Utils; +using Microsoft.PowerFx.Syntax; namespace Microsoft.PowerFx.Core.Functions.Delegation { diff --git a/src/libraries/Microsoft.PowerFx.Core/Functions/Delegation/DelegationMetadataOperatorConstants.cs b/src/libraries/Microsoft.PowerFx.Core/Functions/Delegation/DelegationMetadataOperatorConstants.cs index 661f5df7b1..3a33a13e88 100644 --- a/src/libraries/Microsoft.PowerFx.Core/Functions/Delegation/DelegationMetadataOperatorConstants.cs +++ b/src/libraries/Microsoft.PowerFx.Core/Functions/Delegation/DelegationMetadataOperatorConstants.cs @@ -2,7 +2,6 @@ // Licensed under the MIT license. using System.Collections.Generic; -using Microsoft.PowerFx.Core.Lexer; using Microsoft.PowerFx.Core.Types; using Microsoft.PowerFx.Core.Utils; diff --git a/src/libraries/Microsoft.PowerFx.Core/Functions/Delegation/DelegationStrategies/DefaultOpDelegationStrategy.cs b/src/libraries/Microsoft.PowerFx.Core/Functions/Delegation/DelegationStrategies/DefaultOpDelegationStrategy.cs index cfea7b4a25..c6fd12924c 100644 --- a/src/libraries/Microsoft.PowerFx.Core/Functions/Delegation/DelegationStrategies/DefaultOpDelegationStrategy.cs +++ b/src/libraries/Microsoft.PowerFx.Core/Functions/Delegation/DelegationStrategies/DefaultOpDelegationStrategy.cs @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. // Licensed under the MIT license. -using Microsoft.PowerFx.Core.Lexer; +using Microsoft.PowerFx.Syntax; namespace Microsoft.PowerFx.Core.Functions.Delegation.DelegationStrategies { diff --git a/src/libraries/Microsoft.PowerFx.Core/Functions/Delegation/DelegationStrategies/DefaultUnaryOpDelegationStrategy.cs b/src/libraries/Microsoft.PowerFx.Core/Functions/Delegation/DelegationStrategies/DefaultUnaryOpDelegationStrategy.cs index 866588ee2d..7f29cc1d55 100644 --- a/src/libraries/Microsoft.PowerFx.Core/Functions/Delegation/DelegationStrategies/DefaultUnaryOpDelegationStrategy.cs +++ b/src/libraries/Microsoft.PowerFx.Core/Functions/Delegation/DelegationStrategies/DefaultUnaryOpDelegationStrategy.cs @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. // Licensed under the MIT license. -using Microsoft.PowerFx.Core.Lexer; +using Microsoft.PowerFx.Syntax; namespace Microsoft.PowerFx.Core.Functions.Delegation.DelegationStrategies { diff --git a/src/libraries/Microsoft.PowerFx.Core/Functions/Delegation/DelegationStrategies/DelegationValidationStrategy.cs b/src/libraries/Microsoft.PowerFx.Core/Functions/Delegation/DelegationStrategies/DelegationValidationStrategy.cs index 7c1c116bfd..6b77746bfc 100644 --- a/src/libraries/Microsoft.PowerFx.Core/Functions/Delegation/DelegationStrategies/DelegationValidationStrategy.cs +++ b/src/libraries/Microsoft.PowerFx.Core/Functions/Delegation/DelegationStrategies/DelegationValidationStrategy.cs @@ -6,11 +6,10 @@ using Microsoft.PowerFx.Core.Errors; using Microsoft.PowerFx.Core.Localization; using Microsoft.PowerFx.Core.Logging.Trackers; -using Microsoft.PowerFx.Core.Syntax; -using Microsoft.PowerFx.Core.Syntax.Nodes; using Microsoft.PowerFx.Core.Texl.Builtins; using Microsoft.PowerFx.Core.Types; using Microsoft.PowerFx.Core.Utils; +using Microsoft.PowerFx.Syntax; namespace Microsoft.PowerFx.Core.Functions.Delegation.DelegationStrategies { diff --git a/src/libraries/Microsoft.PowerFx.Core/Functions/Delegation/DelegationStrategies/IOpDelegationStrategy.cs b/src/libraries/Microsoft.PowerFx.Core/Functions/Delegation/DelegationStrategies/IOpDelegationStrategy.cs index cbed05a90e..41bfc2a4d3 100644 --- a/src/libraries/Microsoft.PowerFx.Core/Functions/Delegation/DelegationStrategies/IOpDelegationStrategy.cs +++ b/src/libraries/Microsoft.PowerFx.Core/Functions/Delegation/DelegationStrategies/IOpDelegationStrategy.cs @@ -2,8 +2,8 @@ // Licensed under the MIT license. using Microsoft.PowerFx.Core.Binding; -using Microsoft.PowerFx.Core.Syntax.Nodes; using Microsoft.PowerFx.Core.Utils; +using Microsoft.PowerFx.Syntax; namespace Microsoft.PowerFx.Core.Functions.Delegation.DelegationStrategies { diff --git a/src/libraries/Microsoft.PowerFx.Core/Functions/Delegation/DelegationStrategies/InOpDelegationStrategy.cs b/src/libraries/Microsoft.PowerFx.Core/Functions/Delegation/DelegationStrategies/InOpDelegationStrategy.cs index 1fbef63016..346e1244e1 100644 --- a/src/libraries/Microsoft.PowerFx.Core/Functions/Delegation/DelegationStrategies/InOpDelegationStrategy.cs +++ b/src/libraries/Microsoft.PowerFx.Core/Functions/Delegation/DelegationStrategies/InOpDelegationStrategy.cs @@ -3,14 +3,12 @@ using Microsoft.PowerFx.Core.Binding; using Microsoft.PowerFx.Core.Binding.BindInfo; -using Microsoft.PowerFx.Core.Lexer; using Microsoft.PowerFx.Core.Localization; using Microsoft.PowerFx.Core.Logging; using Microsoft.PowerFx.Core.Logging.Trackers; -using Microsoft.PowerFx.Core.Syntax; -using Microsoft.PowerFx.Core.Syntax.Nodes; using Microsoft.PowerFx.Core.Types; using Microsoft.PowerFx.Core.Utils; +using Microsoft.PowerFx.Syntax; namespace Microsoft.PowerFx.Core.Functions.Delegation.DelegationStrategies { diff --git a/src/libraries/Microsoft.PowerFx.Core/Functions/Delegation/DelegationStrategies/OpDelegationStrategy.cs b/src/libraries/Microsoft.PowerFx.Core/Functions/Delegation/DelegationStrategies/OpDelegationStrategy.cs index 9ccf11fa8f..10d5fcf71d 100644 --- a/src/libraries/Microsoft.PowerFx.Core/Functions/Delegation/DelegationStrategies/OpDelegationStrategy.cs +++ b/src/libraries/Microsoft.PowerFx.Core/Functions/Delegation/DelegationStrategies/OpDelegationStrategy.cs @@ -2,13 +2,11 @@ // Licensed under the MIT license. using Microsoft.PowerFx.Core.Binding; -using Microsoft.PowerFx.Core.Lexer; using Microsoft.PowerFx.Core.Localization; using Microsoft.PowerFx.Core.Logging.Trackers; -using Microsoft.PowerFx.Core.Syntax; -using Microsoft.PowerFx.Core.Syntax.Nodes; using Microsoft.PowerFx.Core.Types; using Microsoft.PowerFx.Core.Utils; +using Microsoft.PowerFx.Syntax; namespace Microsoft.PowerFx.Core.Functions.Delegation.DelegationStrategies { diff --git a/src/libraries/Microsoft.PowerFx.Core/Functions/Delegation/DelegationStrategies/UnaryOpDelegationStrategy.cs b/src/libraries/Microsoft.PowerFx.Core/Functions/Delegation/DelegationStrategies/UnaryOpDelegationStrategy.cs index 8e4bff1e59..057005985d 100644 --- a/src/libraries/Microsoft.PowerFx.Core/Functions/Delegation/DelegationStrategies/UnaryOpDelegationStrategy.cs +++ b/src/libraries/Microsoft.PowerFx.Core/Functions/Delegation/DelegationStrategies/UnaryOpDelegationStrategy.cs @@ -2,13 +2,11 @@ // Licensed under the MIT license. using Microsoft.PowerFx.Core.Binding; -using Microsoft.PowerFx.Core.Lexer; using Microsoft.PowerFx.Core.Localization; using Microsoft.PowerFx.Core.Logging.Trackers; -using Microsoft.PowerFx.Core.Syntax; -using Microsoft.PowerFx.Core.Syntax.Nodes; using Microsoft.PowerFx.Core.Types; using Microsoft.PowerFx.Core.Utils; +using Microsoft.PowerFx.Syntax; namespace Microsoft.PowerFx.Core.Functions.Delegation.DelegationStrategies { diff --git a/src/libraries/Microsoft.PowerFx.Core/Functions/Delegation/ODataFunctionMappings.cs b/src/libraries/Microsoft.PowerFx.Core/Functions/Delegation/ODataFunctionMappings.cs index ec1a8d3c2e..9a512ee904 100644 --- a/src/libraries/Microsoft.PowerFx.Core/Functions/Delegation/ODataFunctionMappings.cs +++ b/src/libraries/Microsoft.PowerFx.Core/Functions/Delegation/ODataFunctionMappings.cs @@ -3,7 +3,7 @@ using System; using System.Collections.Generic; -using Microsoft.PowerFx.Core.Lexer; +using Microsoft.PowerFx.Syntax; namespace Microsoft.PowerFx.Core.Functions.Delegation { diff --git a/src/libraries/Microsoft.PowerFx.Core/Functions/Delegation/OperationCapabilityMetadata.cs b/src/libraries/Microsoft.PowerFx.Core/Functions/Delegation/OperationCapabilityMetadata.cs index a2ed939aea..8e50b4d0eb 100644 --- a/src/libraries/Microsoft.PowerFx.Core/Functions/Delegation/OperationCapabilityMetadata.cs +++ b/src/libraries/Microsoft.PowerFx.Core/Functions/Delegation/OperationCapabilityMetadata.cs @@ -2,9 +2,9 @@ // Licensed under the MIT license. using System.Collections.Generic; -using Microsoft.PowerFx.Core.Lexer; using Microsoft.PowerFx.Core.Types; using Microsoft.PowerFx.Core.Utils; +using Microsoft.PowerFx.Syntax; namespace Microsoft.PowerFx.Core.Functions.Delegation { diff --git a/src/libraries/Microsoft.PowerFx.Core/Functions/FunctionArgValidators/ConnectedDataSourceInfoArgValidator.cs b/src/libraries/Microsoft.PowerFx.Core/Functions/FunctionArgValidators/ConnectedDataSourceInfoArgValidator.cs index 53605c44c8..c475426826 100644 --- a/src/libraries/Microsoft.PowerFx.Core/Functions/FunctionArgValidators/ConnectedDataSourceInfoArgValidator.cs +++ b/src/libraries/Microsoft.PowerFx.Core/Functions/FunctionArgValidators/ConnectedDataSourceInfoArgValidator.cs @@ -3,10 +3,9 @@ using Microsoft.PowerFx.Core.Binding; using Microsoft.PowerFx.Core.Entities; -using Microsoft.PowerFx.Core.Syntax; -using Microsoft.PowerFx.Core.Syntax.Nodes; using Microsoft.PowerFx.Core.Types; using Microsoft.PowerFx.Core.Utils; +using Microsoft.PowerFx.Syntax; namespace Microsoft.PowerFx.Core.Functions.FunctionArgValidators { diff --git a/src/libraries/Microsoft.PowerFx.Core/Functions/FunctionArgValidators/DataSourceArgNodeValidator.cs b/src/libraries/Microsoft.PowerFx.Core/Functions/FunctionArgValidators/DataSourceArgNodeValidator.cs index 6b2bd51f8e..0cb0d80e2a 100644 --- a/src/libraries/Microsoft.PowerFx.Core/Functions/FunctionArgValidators/DataSourceArgNodeValidator.cs +++ b/src/libraries/Microsoft.PowerFx.Core/Functions/FunctionArgValidators/DataSourceArgNodeValidator.cs @@ -4,9 +4,8 @@ using System.Collections.Generic; using Microsoft.PowerFx.Core.Binding; using Microsoft.PowerFx.Core.Entities; -using Microsoft.PowerFx.Core.Syntax; -using Microsoft.PowerFx.Core.Syntax.Nodes; using Microsoft.PowerFx.Core.Utils; +using Microsoft.PowerFx.Syntax; namespace Microsoft.PowerFx.Core.Functions.FunctionArgValidators { diff --git a/src/libraries/Microsoft.PowerFx.Core/Functions/FunctionArgValidators/EntityArgNodeValidator.cs b/src/libraries/Microsoft.PowerFx.Core/Functions/FunctionArgValidators/EntityArgNodeValidator.cs index a3e5ed76d1..fcf2050ae9 100644 --- a/src/libraries/Microsoft.PowerFx.Core/Functions/FunctionArgValidators/EntityArgNodeValidator.cs +++ b/src/libraries/Microsoft.PowerFx.Core/Functions/FunctionArgValidators/EntityArgNodeValidator.cs @@ -2,10 +2,9 @@ // Licensed under the MIT license. using Microsoft.PowerFx.Core.Binding; -using Microsoft.PowerFx.Core.Syntax; -using Microsoft.PowerFx.Core.Syntax.Nodes; using Microsoft.PowerFx.Core.Types; using Microsoft.PowerFx.Core.Utils; +using Microsoft.PowerFx.Syntax; namespace Microsoft.PowerFx.Core.Functions.FunctionArgValidators { diff --git a/src/libraries/Microsoft.PowerFx.Core/Functions/FunctionArgValidators/IArgValidator.cs b/src/libraries/Microsoft.PowerFx.Core/Functions/FunctionArgValidators/IArgValidator.cs index 019b4c4c33..36c9d3c4aa 100644 --- a/src/libraries/Microsoft.PowerFx.Core/Functions/FunctionArgValidators/IArgValidator.cs +++ b/src/libraries/Microsoft.PowerFx.Core/Functions/FunctionArgValidators/IArgValidator.cs @@ -2,7 +2,7 @@ // Licensed under the MIT license. using Microsoft.PowerFx.Core.Binding; -using Microsoft.PowerFx.Core.Syntax.Nodes; +using Microsoft.PowerFx.Syntax; namespace Microsoft.PowerFx.Core.Functions.FunctionArgValidators { diff --git a/src/libraries/Microsoft.PowerFx.Core/Functions/FunctionArgValidators/SortOrderValidator.cs b/src/libraries/Microsoft.PowerFx.Core/Functions/FunctionArgValidators/SortOrderValidator.cs index 06ef9f032f..c8d32558e7 100644 --- a/src/libraries/Microsoft.PowerFx.Core/Functions/FunctionArgValidators/SortOrderValidator.cs +++ b/src/libraries/Microsoft.PowerFx.Core/Functions/FunctionArgValidators/SortOrderValidator.cs @@ -3,10 +3,9 @@ using Microsoft.PowerFx.Core.Binding; using Microsoft.PowerFx.Core.Logging.Trackers; -using Microsoft.PowerFx.Core.Syntax; -using Microsoft.PowerFx.Core.Syntax.Nodes; using Microsoft.PowerFx.Core.Types; using Microsoft.PowerFx.Core.Utils; +using Microsoft.PowerFx.Syntax; namespace Microsoft.PowerFx.Core.Functions.FunctionArgValidators { diff --git a/src/libraries/Microsoft.PowerFx.Core/Functions/FunctionScopeInfo.cs b/src/libraries/Microsoft.PowerFx.Core/Functions/FunctionScopeInfo.cs index 7b0231ca20..fcfac078f1 100644 --- a/src/libraries/Microsoft.PowerFx.Core/Functions/FunctionScopeInfo.cs +++ b/src/libraries/Microsoft.PowerFx.Core/Functions/FunctionScopeInfo.cs @@ -5,10 +5,9 @@ using Microsoft.PowerFx.Core.App.ErrorContainers; using Microsoft.PowerFx.Core.Errors; using Microsoft.PowerFx.Core.Localization; -using Microsoft.PowerFx.Core.Syntax; -using Microsoft.PowerFx.Core.Syntax.Nodes; using Microsoft.PowerFx.Core.Types; using Microsoft.PowerFx.Core.Utils; +using Microsoft.PowerFx.Syntax; namespace Microsoft.PowerFx.Core.Functions { diff --git a/src/libraries/Microsoft.PowerFx.Core/Functions/TexlFunction.cs b/src/libraries/Microsoft.PowerFx.Core/Functions/TexlFunction.cs index 4e3664d85e..ed750ecb85 100644 --- a/src/libraries/Microsoft.PowerFx.Core/Functions/TexlFunction.cs +++ b/src/libraries/Microsoft.PowerFx.Core/Functions/TexlFunction.cs @@ -17,16 +17,16 @@ using Microsoft.PowerFx.Core.Functions.FunctionArgValidators; using Microsoft.PowerFx.Core.Functions.Publish; using Microsoft.PowerFx.Core.Functions.TransportSchemas; -using Microsoft.PowerFx.Core.Lexer; using Microsoft.PowerFx.Core.Localization; using Microsoft.PowerFx.Core.Logging.Trackers; -using Microsoft.PowerFx.Core.Syntax; -using Microsoft.PowerFx.Core.Syntax.Nodes; using Microsoft.PowerFx.Core.Types; using Microsoft.PowerFx.Core.Utils; +using Microsoft.PowerFx.Syntax; namespace Microsoft.PowerFx.Core.Functions { + using FunctionInfo = Microsoft.PowerFx.Core.Functions.TransportSchemas.FunctionInfo; + [ThreadSafeImmutable] internal abstract class TexlFunction : IFunction { diff --git a/src/libraries/Microsoft.PowerFx.Core/IR/IRContext.cs b/src/libraries/Microsoft.PowerFx.Core/IR/IRContext.cs index c6178d1d03..3d6e56c157 100644 --- a/src/libraries/Microsoft.PowerFx.Core/IR/IRContext.cs +++ b/src/libraries/Microsoft.PowerFx.Core/IR/IRContext.cs @@ -2,7 +2,7 @@ // Licensed under the MIT license. using Microsoft.PowerFx.Core.Localization; -using Microsoft.PowerFx.Core.Public.Types; +using Microsoft.PowerFx.Types; namespace Microsoft.PowerFx.Core.IR { diff --git a/src/libraries/Microsoft.PowerFx.Core/IR/IRTranslator.cs b/src/libraries/Microsoft.PowerFx.Core/IR/IRTranslator.cs index b3c7f57a9f..3809142c3e 100644 --- a/src/libraries/Microsoft.PowerFx.Core/IR/IRTranslator.cs +++ b/src/libraries/Microsoft.PowerFx.Core/IR/IRTranslator.cs @@ -9,25 +9,22 @@ using Microsoft.PowerFx.Core.Functions; using Microsoft.PowerFx.Core.IR.Nodes; using Microsoft.PowerFx.Core.IR.Symbols; -using Microsoft.PowerFx.Core.Lexer; -using Microsoft.PowerFx.Core.Public.Types; -using Microsoft.PowerFx.Core.Public.Values; -using Microsoft.PowerFx.Core.Syntax.Nodes; -using Microsoft.PowerFx.Core.Syntax.Visitors; using Microsoft.PowerFx.Core.Texl; using Microsoft.PowerFx.Core.Types; using Microsoft.PowerFx.Core.Utils; +using Microsoft.PowerFx.Syntax; +using Microsoft.PowerFx.Types; using BinaryOpNode = Microsoft.PowerFx.Core.IR.Nodes.BinaryOpNode; using CallNode = Microsoft.PowerFx.Core.IR.Nodes.CallNode; using ErrorNode = Microsoft.PowerFx.Core.IR.Nodes.ErrorNode; using RecordNode = Microsoft.PowerFx.Core.IR.Nodes.RecordNode; using TableNode = Microsoft.PowerFx.Core.IR.Nodes.TableNode; -using TexlBinaryOpNode = Microsoft.PowerFx.Core.Syntax.Nodes.BinaryOpNode; -using TexlCallNode = Microsoft.PowerFx.Core.Syntax.Nodes.CallNode; -using TexlErrorNode = Microsoft.PowerFx.Core.Syntax.Nodes.ErrorNode; -using TexlRecordNode = Microsoft.PowerFx.Core.Syntax.Nodes.RecordNode; -using TexlTableNode = Microsoft.PowerFx.Core.Syntax.Nodes.TableNode; -using TexlUnaryOpNode = Microsoft.PowerFx.Core.Syntax.Nodes.UnaryOpNode; +using TexlBinaryOpNode = Microsoft.PowerFx.Syntax.BinaryOpNode; +using TexlCallNode = Microsoft.PowerFx.Syntax.CallNode; +using TexlErrorNode = Microsoft.PowerFx.Syntax.ErrorNode; +using TexlRecordNode = Microsoft.PowerFx.Syntax.RecordNode; +using TexlTableNode = Microsoft.PowerFx.Syntax.TableNode; +using TexlUnaryOpNode = Microsoft.PowerFx.Syntax.UnaryOpNode; using UnaryOpNode = Microsoft.PowerFx.Core.IR.Nodes.UnaryOpNode; namespace Microsoft.PowerFx.Core.IR diff --git a/src/libraries/Microsoft.PowerFx.Core/IR/Nodes/UnaryOpNode.cs b/src/libraries/Microsoft.PowerFx.Core/IR/Nodes/UnaryOpNode.cs index 7ce6d279ac..fe4098188e 100644 --- a/src/libraries/Microsoft.PowerFx.Core/IR/Nodes/UnaryOpNode.cs +++ b/src/libraries/Microsoft.PowerFx.Core/IR/Nodes/UnaryOpNode.cs @@ -2,7 +2,6 @@ // Licensed under the MIT license. using System.Collections.Generic; -using Microsoft.PowerFx.Core.Public.Types; using Microsoft.PowerFx.Core.Utils; namespace Microsoft.PowerFx.Core.IR.Nodes diff --git a/src/libraries/Microsoft.PowerFx.Core/Lexer/BinaryOp.cs b/src/libraries/Microsoft.PowerFx.Core/Lexer/BinaryOp.cs index 03ce26b213..9737c83e58 100644 --- a/src/libraries/Microsoft.PowerFx.Core/Lexer/BinaryOp.cs +++ b/src/libraries/Microsoft.PowerFx.Core/Lexer/BinaryOp.cs @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. // Licensed under the MIT license. -namespace Microsoft.PowerFx.Core.Lexer +namespace Microsoft.PowerFx.Syntax { /// /// Kinds of binary operators. diff --git a/src/libraries/Microsoft.PowerFx.Core/Lexer/LocalizationUtils.cs b/src/libraries/Microsoft.PowerFx.Core/Lexer/LocalizationUtils.cs index db20ec9d3d..a17085f960 100644 --- a/src/libraries/Microsoft.PowerFx.Core/Lexer/LocalizationUtils.cs +++ b/src/libraries/Microsoft.PowerFx.Core/Lexer/LocalizationUtils.cs @@ -6,7 +6,7 @@ using Microsoft.PowerFx.Core.Localization; using Microsoft.PowerFx.Core.Utils; -namespace Microsoft.PowerFx.Core.Lexer +namespace Microsoft.PowerFx.Syntax { internal sealed class LocalizationUtils { diff --git a/src/libraries/Microsoft.PowerFx.Core/Lexer/TexlLexer.cs b/src/libraries/Microsoft.PowerFx.Core/Lexer/TexlLexer.cs index 7a07230f51..97e1317231 100644 --- a/src/libraries/Microsoft.PowerFx.Core/Lexer/TexlLexer.cs +++ b/src/libraries/Microsoft.PowerFx.Core/Lexer/TexlLexer.cs @@ -6,16 +6,15 @@ using System.Globalization; using System.Text; using System.Threading; -using Microsoft.PowerFx.Core.Lexer.Tokens; using Microsoft.PowerFx.Core.Localization; using Microsoft.PowerFx.Core.Types; using Microsoft.PowerFx.Core.Utils; // Used as a temporary storage for LexerImpl class. // LexerImpl is private, so we cannot define 'using' for it here - TexlLexer instead. -using StringBuilderCache = Microsoft.PowerFx.Core.Utils.StringBuilderCache; +using StringBuilderCache = Microsoft.PowerFx.Core.Utils.StringBuilderCache; -namespace Microsoft.PowerFx.Core.Lexer +namespace Microsoft.PowerFx.Syntax { // TEXL expression lexer internal sealed class TexlLexer diff --git a/src/libraries/Microsoft.PowerFx.Core/Lexer/TokKind.cs b/src/libraries/Microsoft.PowerFx.Core/Lexer/TokKind.cs index b227bcae74..95f3541301 100644 --- a/src/libraries/Microsoft.PowerFx.Core/Lexer/TokKind.cs +++ b/src/libraries/Microsoft.PowerFx.Core/Lexer/TokKind.cs @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. // Licensed under the MIT license. -namespace Microsoft.PowerFx.Core.Lexer +namespace Microsoft.PowerFx.Syntax { /// /// Kinds of tokens. diff --git a/src/libraries/Microsoft.PowerFx.Core/Lexer/TokenCollection.cs b/src/libraries/Microsoft.PowerFx.Core/Lexer/TokenCollection.cs index cfbdc0955d..aeae3d6c85 100644 --- a/src/libraries/Microsoft.PowerFx.Core/Lexer/TokenCollection.cs +++ b/src/libraries/Microsoft.PowerFx.Core/Lexer/TokenCollection.cs @@ -3,11 +3,10 @@ using System.Collections.Generic; using System.Linq; -using Microsoft.PowerFx.Core.Lexer.Tokens; using Microsoft.PowerFx.Core.Localization; using Microsoft.PowerFx.Core.Utils; -namespace Microsoft.PowerFx.Core.Lexer +namespace Microsoft.PowerFx.Syntax { internal class TokenCollection { @@ -74,4 +73,4 @@ public IEnumerable GetAllMatches(TokenCollection needle) return matches; } } -} \ No newline at end of file +} diff --git a/src/libraries/Microsoft.PowerFx.Core/Lexer/Tokens/CommentToken.cs b/src/libraries/Microsoft.PowerFx.Core/Lexer/Tokens/CommentToken.cs index 049e77d5b6..2572e3eb58 100644 --- a/src/libraries/Microsoft.PowerFx.Core/Lexer/Tokens/CommentToken.cs +++ b/src/libraries/Microsoft.PowerFx.Core/Lexer/Tokens/CommentToken.cs @@ -4,7 +4,7 @@ using Microsoft.PowerFx.Core.Localization; using Microsoft.PowerFx.Core.Utils; -namespace Microsoft.PowerFx.Core.Lexer.Tokens +namespace Microsoft.PowerFx.Syntax { /// /// Token for a comment. diff --git a/src/libraries/Microsoft.PowerFx.Core/Lexer/Tokens/EofToken.cs b/src/libraries/Microsoft.PowerFx.Core/Lexer/Tokens/EofToken.cs index df0649b800..f52c9e46a8 100644 --- a/src/libraries/Microsoft.PowerFx.Core/Lexer/Tokens/EofToken.cs +++ b/src/libraries/Microsoft.PowerFx.Core/Lexer/Tokens/EofToken.cs @@ -3,7 +3,7 @@ using Microsoft.PowerFx.Core.Localization; -namespace Microsoft.PowerFx.Core.Lexer.Tokens +namespace Microsoft.PowerFx.Syntax { internal class EofToken : Token { diff --git a/src/libraries/Microsoft.PowerFx.Core/Lexer/Tokens/ErrorToken.cs b/src/libraries/Microsoft.PowerFx.Core/Lexer/Tokens/ErrorToken.cs index 899677689b..c116cf48f9 100644 --- a/src/libraries/Microsoft.PowerFx.Core/Lexer/Tokens/ErrorToken.cs +++ b/src/libraries/Microsoft.PowerFx.Core/Lexer/Tokens/ErrorToken.cs @@ -5,7 +5,7 @@ using Microsoft.PowerFx.Core.Localization; using Microsoft.PowerFx.Core.Utils; -namespace Microsoft.PowerFx.Core.Lexer.Tokens +namespace Microsoft.PowerFx.Syntax { /// /// Token for lexing error. diff --git a/src/libraries/Microsoft.PowerFx.Core/Lexer/Tokens/IdentToken.cs b/src/libraries/Microsoft.PowerFx.Core/Lexer/Tokens/IdentToken.cs index 7aabeb1696..29148344e3 100644 --- a/src/libraries/Microsoft.PowerFx.Core/Lexer/Tokens/IdentToken.cs +++ b/src/libraries/Microsoft.PowerFx.Core/Lexer/Tokens/IdentToken.cs @@ -7,7 +7,7 @@ using Microsoft.PowerFx.Core.Localization; using Microsoft.PowerFx.Core.Utils; -namespace Microsoft.PowerFx.Core.Lexer.Tokens +namespace Microsoft.PowerFx.Syntax { /// /// Token for an identifier/name. diff --git a/src/libraries/Microsoft.PowerFx.Core/Lexer/Tokens/IslandEndToken.cs b/src/libraries/Microsoft.PowerFx.Core/Lexer/Tokens/IslandEndToken.cs index 80ae2f67b0..6fe4f188a0 100644 --- a/src/libraries/Microsoft.PowerFx.Core/Lexer/Tokens/IslandEndToken.cs +++ b/src/libraries/Microsoft.PowerFx.Core/Lexer/Tokens/IslandEndToken.cs @@ -4,7 +4,7 @@ using Microsoft.PowerFx.Core.Localization; using Microsoft.PowerFx.Core.Utils; -namespace Microsoft.PowerFx.Core.Lexer.Tokens +namespace Microsoft.PowerFx.Syntax { internal class IslandEndToken : Token { diff --git a/src/libraries/Microsoft.PowerFx.Core/Lexer/Tokens/IslandStartToken.cs b/src/libraries/Microsoft.PowerFx.Core/Lexer/Tokens/IslandStartToken.cs index d0b985e095..c4e4bfb488 100644 --- a/src/libraries/Microsoft.PowerFx.Core/Lexer/Tokens/IslandStartToken.cs +++ b/src/libraries/Microsoft.PowerFx.Core/Lexer/Tokens/IslandStartToken.cs @@ -4,7 +4,7 @@ using Microsoft.PowerFx.Core.Localization; using Microsoft.PowerFx.Core.Utils; -namespace Microsoft.PowerFx.Core.Lexer.Tokens +namespace Microsoft.PowerFx.Syntax { internal class IslandStartToken : Token { diff --git a/src/libraries/Microsoft.PowerFx.Core/Lexer/Tokens/KeyToken.cs b/src/libraries/Microsoft.PowerFx.Core/Lexer/Tokens/KeyToken.cs index 00032946dd..a3782cbacc 100644 --- a/src/libraries/Microsoft.PowerFx.Core/Lexer/Tokens/KeyToken.cs +++ b/src/libraries/Microsoft.PowerFx.Core/Lexer/Tokens/KeyToken.cs @@ -4,7 +4,7 @@ using Microsoft.PowerFx.Core.Localization; using Microsoft.PowerFx.Core.Utils; -namespace Microsoft.PowerFx.Core.Lexer.Tokens +namespace Microsoft.PowerFx.Syntax { internal class KeyToken : Token { diff --git a/src/libraries/Microsoft.PowerFx.Core/Lexer/Tokens/NumLitToken.cs b/src/libraries/Microsoft.PowerFx.Core/Lexer/Tokens/NumLitToken.cs index 24f2d53f9c..03893e05bd 100644 --- a/src/libraries/Microsoft.PowerFx.Core/Lexer/Tokens/NumLitToken.cs +++ b/src/libraries/Microsoft.PowerFx.Core/Lexer/Tokens/NumLitToken.cs @@ -4,7 +4,7 @@ using Microsoft.PowerFx.Core.Localization; using Microsoft.PowerFx.Core.Utils; -namespace Microsoft.PowerFx.Core.Lexer.Tokens +namespace Microsoft.PowerFx.Syntax { /// /// Token for a numeric literal. diff --git a/src/libraries/Microsoft.PowerFx.Core/Lexer/Tokens/StrInterpEndToken.cs b/src/libraries/Microsoft.PowerFx.Core/Lexer/Tokens/StrInterpEndToken.cs index f747232e97..96c19a6eb4 100644 --- a/src/libraries/Microsoft.PowerFx.Core/Lexer/Tokens/StrInterpEndToken.cs +++ b/src/libraries/Microsoft.PowerFx.Core/Lexer/Tokens/StrInterpEndToken.cs @@ -4,7 +4,7 @@ using Microsoft.PowerFx.Core.Localization; using Microsoft.PowerFx.Core.Utils; -namespace Microsoft.PowerFx.Core.Lexer.Tokens +namespace Microsoft.PowerFx.Syntax { internal class StrInterpEndToken : Token { diff --git a/src/libraries/Microsoft.PowerFx.Core/Lexer/Tokens/StrInterpStartToken.cs b/src/libraries/Microsoft.PowerFx.Core/Lexer/Tokens/StrInterpStartToken.cs index 8a476ddc49..5b41c6d83f 100644 --- a/src/libraries/Microsoft.PowerFx.Core/Lexer/Tokens/StrInterpStartToken.cs +++ b/src/libraries/Microsoft.PowerFx.Core/Lexer/Tokens/StrInterpStartToken.cs @@ -4,7 +4,7 @@ using Microsoft.PowerFx.Core.Localization; using Microsoft.PowerFx.Core.Utils; -namespace Microsoft.PowerFx.Core.Lexer.Tokens +namespace Microsoft.PowerFx.Syntax { internal class StrInterpStartToken : Token { diff --git a/src/libraries/Microsoft.PowerFx.Core/Lexer/Tokens/StrLitToken.cs b/src/libraries/Microsoft.PowerFx.Core/Lexer/Tokens/StrLitToken.cs index 444e5d0905..d5a2198fcf 100644 --- a/src/libraries/Microsoft.PowerFx.Core/Lexer/Tokens/StrLitToken.cs +++ b/src/libraries/Microsoft.PowerFx.Core/Lexer/Tokens/StrLitToken.cs @@ -4,7 +4,7 @@ using Microsoft.PowerFx.Core.Localization; using Microsoft.PowerFx.Core.Utils; -namespace Microsoft.PowerFx.Core.Lexer.Tokens +namespace Microsoft.PowerFx.Syntax { /// /// Token for a string literal. diff --git a/src/libraries/Microsoft.PowerFx.Core/Lexer/Tokens/Token.cs b/src/libraries/Microsoft.PowerFx.Core/Lexer/Tokens/Token.cs index 6497d48212..2ab6f178b3 100644 --- a/src/libraries/Microsoft.PowerFx.Core/Lexer/Tokens/Token.cs +++ b/src/libraries/Microsoft.PowerFx.Core/Lexer/Tokens/Token.cs @@ -5,7 +5,7 @@ using Microsoft.PowerFx.Core.Localization; using Microsoft.PowerFx.Core.Utils; -namespace Microsoft.PowerFx.Core.Lexer.Tokens +namespace Microsoft.PowerFx.Syntax { /// /// Base class for all lexing tokens. diff --git a/src/libraries/Microsoft.PowerFx.Core/Lexer/Tokens/WhitespaceToken.cs b/src/libraries/Microsoft.PowerFx.Core/Lexer/Tokens/WhitespaceToken.cs index 7a9e92dab1..0b27ccb074 100644 --- a/src/libraries/Microsoft.PowerFx.Core/Lexer/Tokens/WhitespaceToken.cs +++ b/src/libraries/Microsoft.PowerFx.Core/Lexer/Tokens/WhitespaceToken.cs @@ -4,7 +4,7 @@ using Microsoft.PowerFx.Core.Localization; using Microsoft.PowerFx.Core.Utils; -namespace Microsoft.PowerFx.Core.Lexer.Tokens +namespace Microsoft.PowerFx.Syntax { /// /// A token for a series of whitespace characters. diff --git a/src/libraries/Microsoft.PowerFx.Core/Lexer/UnaryOp.cs b/src/libraries/Microsoft.PowerFx.Core/Lexer/UnaryOp.cs index 15beaaaf56..c8ddfaa86b 100644 --- a/src/libraries/Microsoft.PowerFx.Core/Lexer/UnaryOp.cs +++ b/src/libraries/Microsoft.PowerFx.Core/Lexer/UnaryOp.cs @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. // Licensed under the MIT license. -namespace Microsoft.PowerFx.Core.Lexer +namespace Microsoft.PowerFx.Syntax { /// /// Kinds of unary operators. diff --git a/src/libraries/Microsoft.PowerFx.Core/Lexer/VariadicOp.cs b/src/libraries/Microsoft.PowerFx.Core/Lexer/VariadicOp.cs index 4e39651d15..e2f88eaeba 100644 --- a/src/libraries/Microsoft.PowerFx.Core/Lexer/VariadicOp.cs +++ b/src/libraries/Microsoft.PowerFx.Core/Lexer/VariadicOp.cs @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. // Licensed under the MIT license. -namespace Microsoft.PowerFx.Core.Lexer +namespace Microsoft.PowerFx.Syntax { /// /// Kinds of variadic operators. diff --git a/src/libraries/Microsoft.PowerFx.Core/Localization/LanguageSettings.cs b/src/libraries/Microsoft.PowerFx.Core/Localization/LanguageSettings.cs index 501cc1048e..5b502bd3dc 100644 --- a/src/libraries/Microsoft.PowerFx.Core/Localization/LanguageSettings.cs +++ b/src/libraries/Microsoft.PowerFx.Core/Localization/LanguageSettings.cs @@ -2,8 +2,8 @@ // Licensed under the MIT license. using System.Collections.Generic; -using Microsoft.PowerFx.Core.Lexer; using Microsoft.PowerFx.Core.Utils; +using Microsoft.PowerFx.Syntax; namespace Microsoft.PowerFx.Core.Localization { diff --git a/src/libraries/Microsoft.PowerFx.Core/Logging/ISanitizedNameProvider.cs b/src/libraries/Microsoft.PowerFx.Core/Logging/ISanitizedNameProvider.cs index 64bac4ad63..16656fb726 100644 --- a/src/libraries/Microsoft.PowerFx.Core/Logging/ISanitizedNameProvider.cs +++ b/src/libraries/Microsoft.PowerFx.Core/Logging/ISanitizedNameProvider.cs @@ -1,8 +1,7 @@ // Copyright (c) Microsoft Corporation. // Licensed under the MIT license. -using Microsoft.PowerFx.Core.Syntax; -using Microsoft.PowerFx.Core.Syntax.Nodes; +using Microsoft.PowerFx.Syntax; namespace Microsoft.PowerFx.Core.Logging { diff --git a/src/libraries/Microsoft.PowerFx.Core/Logging/StructuralPrint.cs b/src/libraries/Microsoft.PowerFx.Core/Logging/StructuralPrint.cs index be8d9109f1..31b3ae4619 100644 --- a/src/libraries/Microsoft.PowerFx.Core/Logging/StructuralPrint.cs +++ b/src/libraries/Microsoft.PowerFx.Core/Logging/StructuralPrint.cs @@ -3,14 +3,10 @@ using System; using Microsoft.PowerFx.Core.Binding; -using Microsoft.PowerFx.Core.Lexer; -using Microsoft.PowerFx.Core.Lexer.Tokens; using Microsoft.PowerFx.Core.Parser; -using Microsoft.PowerFx.Core.Syntax; -using Microsoft.PowerFx.Core.Syntax.Nodes; -using Microsoft.PowerFx.Core.Syntax.Visitors; using Microsoft.PowerFx.Core.UtilityDataStructures; using Microsoft.PowerFx.Core.Utils; +using Microsoft.PowerFx.Syntax; namespace Microsoft.PowerFx.Core.Logging { diff --git a/src/libraries/Microsoft.PowerFx.Core/Logging/Trackers/DelegationTelemetryInfo.cs b/src/libraries/Microsoft.PowerFx.Core/Logging/Trackers/DelegationTelemetryInfo.cs index e2bf8729ce..cfdb9cd065 100644 --- a/src/libraries/Microsoft.PowerFx.Core/Logging/Trackers/DelegationTelemetryInfo.cs +++ b/src/libraries/Microsoft.PowerFx.Core/Logging/Trackers/DelegationTelemetryInfo.cs @@ -5,10 +5,8 @@ using Microsoft.PowerFx.Core.Binding.BindInfo; using Microsoft.PowerFx.Core.Entities; using Microsoft.PowerFx.Core.Functions; -using Microsoft.PowerFx.Core.Lexer; -using Microsoft.PowerFx.Core.Syntax; -using Microsoft.PowerFx.Core.Syntax.Nodes; using Microsoft.PowerFx.Core.Utils; +using Microsoft.PowerFx.Syntax; namespace Microsoft.PowerFx.Core.Logging.Trackers { diff --git a/src/libraries/Microsoft.PowerFx.Core/Logging/Trackers/DelegationTrackerEventArgs.cs b/src/libraries/Microsoft.PowerFx.Core/Logging/Trackers/DelegationTrackerEventArgs.cs index e853bb1d76..334546e4b9 100644 --- a/src/libraries/Microsoft.PowerFx.Core/Logging/Trackers/DelegationTrackerEventArgs.cs +++ b/src/libraries/Microsoft.PowerFx.Core/Logging/Trackers/DelegationTrackerEventArgs.cs @@ -3,8 +3,8 @@ using Microsoft.PowerFx.Core.Binding; using Microsoft.PowerFx.Core.Functions; -using Microsoft.PowerFx.Core.Syntax.Nodes; using Microsoft.PowerFx.Core.Utils; +using Microsoft.PowerFx.Syntax; namespace Microsoft.PowerFx.Core.Logging.Trackers { diff --git a/src/libraries/Microsoft.PowerFx.Core/Logging/Trackers/SuggestionTrackerEventArgs.cs b/src/libraries/Microsoft.PowerFx.Core/Logging/Trackers/SuggestionTrackerEventArgs.cs index 40e52260df..18144a0147 100644 --- a/src/libraries/Microsoft.PowerFx.Core/Logging/Trackers/SuggestionTrackerEventArgs.cs +++ b/src/libraries/Microsoft.PowerFx.Core/Logging/Trackers/SuggestionTrackerEventArgs.cs @@ -2,8 +2,8 @@ // Licensed under the MIT license. using Microsoft.PowerFx.Core.Binding; -using Microsoft.PowerFx.Core.Syntax.Nodes; using Microsoft.PowerFx.Core.Utils; +using Microsoft.PowerFx.Syntax; namespace Microsoft.PowerFx.Core.Logging.Trackers { diff --git a/src/libraries/Microsoft.PowerFx.Core/Logging/Trackers/TrackingProvider.cs b/src/libraries/Microsoft.PowerFx.Core/Logging/Trackers/TrackingProvider.cs index f6fd332b23..9cdb5055ac 100644 --- a/src/libraries/Microsoft.PowerFx.Core/Logging/Trackers/TrackingProvider.cs +++ b/src/libraries/Microsoft.PowerFx.Core/Logging/Trackers/TrackingProvider.cs @@ -4,7 +4,7 @@ using System; using Microsoft.PowerFx.Core.Binding; using Microsoft.PowerFx.Core.Functions; -using Microsoft.PowerFx.Core.Syntax.Nodes; +using Microsoft.PowerFx.Syntax; namespace Microsoft.PowerFx.Core.Logging.Trackers { diff --git a/src/libraries/Microsoft.PowerFx.Core/Parser/ParseFormulasResult.cs b/src/libraries/Microsoft.PowerFx.Core/Parser/ParseFormulasResult.cs index 4d62f87977..c2eccd6c91 100644 --- a/src/libraries/Microsoft.PowerFx.Core/Parser/ParseFormulasResult.cs +++ b/src/libraries/Microsoft.PowerFx.Core/Parser/ParseFormulasResult.cs @@ -4,10 +4,8 @@ using System.Collections.Generic; using System.Linq; using Microsoft.PowerFx.Core.Errors; -using Microsoft.PowerFx.Core.Lexer.Tokens; -using Microsoft.PowerFx.Core.Syntax; -using Microsoft.PowerFx.Core.Syntax.Nodes; using Microsoft.PowerFx.Core.Utils; +using Microsoft.PowerFx.Syntax; namespace Microsoft.PowerFx.Core.Parser { diff --git a/src/libraries/Microsoft.PowerFx.Core/Parser/ParseResult.cs b/src/libraries/Microsoft.PowerFx.Core/Parser/ParseResult.cs index 20d935061e..16d91bc31d 100644 --- a/src/libraries/Microsoft.PowerFx.Core/Parser/ParseResult.cs +++ b/src/libraries/Microsoft.PowerFx.Core/Parser/ParseResult.cs @@ -5,13 +5,11 @@ using System.Linq; using System.Text; using Microsoft.PowerFx.Core.Errors; -using Microsoft.PowerFx.Core.Lexer.Tokens; -using Microsoft.PowerFx.Core.Public; -using Microsoft.PowerFx.Core.Syntax.Nodes; -using Microsoft.PowerFx.Core.Syntax.SourceInformation; using Microsoft.PowerFx.Core.Utils; +using Microsoft.PowerFx.Syntax; +using Microsoft.PowerFx.Syntax.SourceInformation; -namespace Microsoft.PowerFx.Core.Parser +namespace Microsoft.PowerFx { /// /// Result of parsing an expression. diff --git a/src/libraries/Microsoft.PowerFx.Core/Parser/ParserOptions.cs b/src/libraries/Microsoft.PowerFx.Core/Parser/ParserOptions.cs index f28c650aa5..cbacdaa91c 100644 --- a/src/libraries/Microsoft.PowerFx.Core/Parser/ParserOptions.cs +++ b/src/libraries/Microsoft.PowerFx.Core/Parser/ParserOptions.cs @@ -7,7 +7,7 @@ using Microsoft.PowerFx.Core.Localization; using Microsoft.PowerFx.Core.Parser; -namespace Microsoft.PowerFx.Core.Public +namespace Microsoft.PowerFx { /// /// Options for parsing an expression. diff --git a/src/libraries/Microsoft.PowerFx.Core/Parser/TexlParser.cs b/src/libraries/Microsoft.PowerFx.Core/Parser/TexlParser.cs index 493c676bc6..b4983b1d97 100644 --- a/src/libraries/Microsoft.PowerFx.Core/Parser/TexlParser.cs +++ b/src/libraries/Microsoft.PowerFx.Core/Parser/TexlParser.cs @@ -5,13 +5,10 @@ using System.Collections.Generic; using System.Linq; using Microsoft.PowerFx.Core.Errors; -using Microsoft.PowerFx.Core.Lexer; -using Microsoft.PowerFx.Core.Lexer.Tokens; using Microsoft.PowerFx.Core.Localization; -using Microsoft.PowerFx.Core.Syntax; -using Microsoft.PowerFx.Core.Syntax.Nodes; -using Microsoft.PowerFx.Core.Syntax.SourceInformation; using Microsoft.PowerFx.Core.Utils; +using Microsoft.PowerFx.Syntax; +using Microsoft.PowerFx.Syntax.SourceInformation; namespace Microsoft.PowerFx.Core.Parser { @@ -670,7 +667,7 @@ private TexlNode ParseOperand() case TokKind.StrInterpStart: var res = ParseStringInterpolation(); var tokCur = _curs.TokCur; - if (FeatureFlags.StringInterpolation) + if (Preview.FeatureFlags.StringInterpolation) { return res; } diff --git a/src/libraries/Microsoft.PowerFx.Core/Parser/TokenCursor.cs b/src/libraries/Microsoft.PowerFx.Core/Parser/TokenCursor.cs index 0ca8ceb6e8..5de68aeddc 100644 --- a/src/libraries/Microsoft.PowerFx.Core/Parser/TokenCursor.cs +++ b/src/libraries/Microsoft.PowerFx.Core/Parser/TokenCursor.cs @@ -3,9 +3,8 @@ using System.Collections.Generic; using System.Linq; -using Microsoft.PowerFx.Core.Lexer; -using Microsoft.PowerFx.Core.Lexer.Tokens; using Microsoft.PowerFx.Core.Utils; +using Microsoft.PowerFx.Syntax; using Conditional = System.Diagnostics.ConditionalAttribute; namespace Microsoft.PowerFx.Core.Parser @@ -173,4 +172,4 @@ private int ItokPeek(int ditok) return itokPeek; } } -} \ No newline at end of file +} diff --git a/src/libraries/Microsoft.PowerFx.Core/Public/CheckResult.cs b/src/libraries/Microsoft.PowerFx.Core/Public/CheckResult.cs index 0b827e08f7..e7fcc8d605 100644 --- a/src/libraries/Microsoft.PowerFx.Core/Public/CheckResult.cs +++ b/src/libraries/Microsoft.PowerFx.Core/Public/CheckResult.cs @@ -6,12 +6,13 @@ using System.Linq; using Microsoft.PowerFx.Core.Binding; using Microsoft.PowerFx.Core.Errors; -using Microsoft.PowerFx.Core.Parser; -using Microsoft.PowerFx.Core.Public.Types; -using Microsoft.PowerFx.Core.Syntax.Nodes; +using Microsoft.PowerFx.Core.Public; using Microsoft.PowerFx.Core.Utils; +using Microsoft.PowerFx.Intellisense; +using Microsoft.PowerFx.Syntax; +using Microsoft.PowerFx.Types; -namespace Microsoft.PowerFx.Core.Public +namespace Microsoft.PowerFx { /// /// Result of binding an expression. diff --git a/src/libraries/Microsoft.PowerFx.Core/Public/Config/PowerFxConfig.cs b/src/libraries/Microsoft.PowerFx.Core/Public/Config/PowerFxConfig.cs index cc4040e559..72c62ea307 100644 --- a/src/libraries/Microsoft.PowerFx.Core/Public/Config/PowerFxConfig.cs +++ b/src/libraries/Microsoft.PowerFx.Core/Public/Config/PowerFxConfig.cs @@ -5,6 +5,7 @@ using System.Collections.Generic; using System.Globalization; using System.Linq; +using Microsoft.PowerFx.Core; using Microsoft.PowerFx.Core.Entities; using Microsoft.PowerFx.Core.Functions; using Microsoft.PowerFx.Core.Public; @@ -12,7 +13,7 @@ using Microsoft.PowerFx.Core.Types.Enums; using Microsoft.PowerFx.Core.Utils; -namespace Microsoft.PowerFx.Core +namespace Microsoft.PowerFx { /// /// A container that allows for compiler customization. diff --git a/src/libraries/Microsoft.PowerFx.Core/Public/DependencyFinder.cs b/src/libraries/Microsoft.PowerFx.Core/Public/DependencyFinder.cs index b2cdd707c7..0bcd6a5856 100644 --- a/src/libraries/Microsoft.PowerFx.Core/Public/DependencyFinder.cs +++ b/src/libraries/Microsoft.PowerFx.Core/Public/DependencyFinder.cs @@ -4,8 +4,7 @@ using System.Collections.Generic; using Microsoft.PowerFx.Core.Binding; using Microsoft.PowerFx.Core.Binding.BindInfo; -using Microsoft.PowerFx.Core.Syntax.Nodes; -using Microsoft.PowerFx.Core.Syntax.Visitors; +using Microsoft.PowerFx.Syntax; namespace Microsoft.PowerFx { diff --git a/src/libraries/Microsoft.PowerFx.Core/Public/DisplayNames/DisplayNameUtility.cs b/src/libraries/Microsoft.PowerFx.Core/Public/DisplayNames/DisplayNameUtility.cs index e4affe6773..126807ceb5 100644 --- a/src/libraries/Microsoft.PowerFx.Core/Public/DisplayNames/DisplayNameUtility.cs +++ b/src/libraries/Microsoft.PowerFx.Core/Public/DisplayNames/DisplayNameUtility.cs @@ -4,9 +4,9 @@ using System; using System.Collections.Generic; using System.Linq; -using Microsoft.PowerFx.Core.Lexer; using Microsoft.PowerFx.Core.UtilityDataStructures; using Microsoft.PowerFx.Core.Utils; +using Microsoft.PowerFx.Syntax; namespace Microsoft.PowerFx.Core { diff --git a/src/libraries/Microsoft.PowerFx.Core/Public/DisplayNames/NameCollisionException.cs b/src/libraries/Microsoft.PowerFx.Core/Public/DisplayNames/NameCollisionException.cs index 312a04326b..827e03fd89 100644 --- a/src/libraries/Microsoft.PowerFx.Core/Public/DisplayNames/NameCollisionException.cs +++ b/src/libraries/Microsoft.PowerFx.Core/Public/DisplayNames/NameCollisionException.cs @@ -5,7 +5,7 @@ using System.Collections.Generic; using System.Text; -namespace Microsoft.PowerFx.Core +namespace Microsoft.PowerFx { public class NameCollisionException : Exception { diff --git a/src/libraries/Microsoft.PowerFx.Core/Public/DisplayNames/RenameDriver.cs b/src/libraries/Microsoft.PowerFx.Core/Public/DisplayNames/RenameDriver.cs index 46d3dddafd..4cac4dcdd9 100644 --- a/src/libraries/Microsoft.PowerFx.Core/Public/DisplayNames/RenameDriver.cs +++ b/src/libraries/Microsoft.PowerFx.Core/Public/DisplayNames/RenameDriver.cs @@ -2,11 +2,10 @@ // Licensed under the MIT license. using System.Collections.Generic; -using Microsoft.PowerFx.Core; using Microsoft.PowerFx.Core.Glue; -using Microsoft.PowerFx.Core.Public.Types; using Microsoft.PowerFx.Core.Types; using Microsoft.PowerFx.Core.Utils; +using Microsoft.PowerFx.Types; namespace Microsoft.PowerFx.Core { diff --git a/src/libraries/Microsoft.PowerFx.Core/Public/Engine.cs b/src/libraries/Microsoft.PowerFx.Core/Public/Engine.cs index 0a487825bf..74b992ab1a 100644 --- a/src/libraries/Microsoft.PowerFx.Core/Public/Engine.cs +++ b/src/libraries/Microsoft.PowerFx.Core/Public/Engine.cs @@ -5,16 +5,13 @@ using Microsoft.PowerFx.Core; using Microsoft.PowerFx.Core.Binding; using Microsoft.PowerFx.Core.Glue; -using Microsoft.PowerFx.Core.Lexer; -using Microsoft.PowerFx.Core.Lexer.Tokens; using Microsoft.PowerFx.Core.Localization; using Microsoft.PowerFx.Core.Parser; -using Microsoft.PowerFx.Core.Public; -using Microsoft.PowerFx.Core.Public.Types; -using Microsoft.PowerFx.Core.Syntax; -using Microsoft.PowerFx.Core.Texl.Intellisense; using Microsoft.PowerFx.Core.Types; using Microsoft.PowerFx.Core.Utils; +using Microsoft.PowerFx.Intellisense; +using Microsoft.PowerFx.Syntax; +using Microsoft.PowerFx.Types; namespace Microsoft.PowerFx { diff --git a/src/libraries/Microsoft.PowerFx.Core/Public/ErrorKind.cs b/src/libraries/Microsoft.PowerFx.Core/Public/ErrorKind.cs index 2496907a68..c3cd77139f 100644 --- a/src/libraries/Microsoft.PowerFx.Core/Public/ErrorKind.cs +++ b/src/libraries/Microsoft.PowerFx.Core/Public/ErrorKind.cs @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. // Licensed under the MIT license. -namespace Microsoft.PowerFx.Core.Public +namespace Microsoft.PowerFx { /// /// Indicates the error on a record in a connected data source. diff --git a/src/libraries/Microsoft.PowerFx.Core/Public/ExpressionError.cs b/src/libraries/Microsoft.PowerFx.Core/Public/ExpressionError.cs index e6afa179b4..670a8a9a29 100644 --- a/src/libraries/Microsoft.PowerFx.Core/Public/ExpressionError.cs +++ b/src/libraries/Microsoft.PowerFx.Core/Public/ExpressionError.cs @@ -5,9 +5,9 @@ using System.Linq; using Microsoft.PowerFx.Core.Errors; using Microsoft.PowerFx.Core.Localization; -using Microsoft.PowerFx.Core.Public.Values; +using Microsoft.PowerFx.Types; -namespace Microsoft.PowerFx.Core.Public +namespace Microsoft.PowerFx { /// /// Error message. This could be a compile time error from parsing or binding, @@ -30,14 +30,14 @@ public class ExpressionError /// public ErrorKind Kind { get; set; } - public DocumentErrorSeverity Severity { get; set; } = DocumentErrorSeverity.Severe; + public ErrorSeverity Severity { get; set; } = ErrorSeverity.Severe; public string MessageKey { get; set; } /// /// A warning does not prevent executing the error. See for more details. /// - public bool IsWarning => Severity < DocumentErrorSeverity.Severe; + public bool IsWarning => Severity < ErrorSeverity.Severe; public override string ToString() { @@ -59,7 +59,7 @@ internal static ExpressionError New(IDocumentError error) { Message = error.ShortMessage, Span = error.TextSpan, - Severity = error.Severity, + Severity = (ErrorSeverity)error.Severity, MessageKey = error.MessageKey }; } diff --git a/src/libraries/Microsoft.PowerFx.Core/Public/FormulaWithParameters.cs b/src/libraries/Microsoft.PowerFx.Core/Public/FormulaWithParameters.cs index e525cd2d93..31a1b6b129 100644 --- a/src/libraries/Microsoft.PowerFx.Core/Public/FormulaWithParameters.cs +++ b/src/libraries/Microsoft.PowerFx.Core/Public/FormulaWithParameters.cs @@ -1,9 +1,9 @@ // Copyright (c) Microsoft Corporation. // Licensed under the MIT license. -using Microsoft.PowerFx.Core.Public.Types; +using Microsoft.PowerFx.Types; -namespace Microsoft.PowerFx.Core.Public +namespace Microsoft.PowerFx { /// /// Encapsulate a formula and the parameters it has available. diff --git a/src/libraries/Microsoft.PowerFx.Core/Public/FunctionInfo.cs b/src/libraries/Microsoft.PowerFx.Core/Public/FunctionInfo.cs index c231cae63e..99901eb55f 100644 --- a/src/libraries/Microsoft.PowerFx.Core/Public/FunctionInfo.cs +++ b/src/libraries/Microsoft.PowerFx.Core/Public/FunctionInfo.cs @@ -4,7 +4,7 @@ using System; using Microsoft.PowerFx.Core.Functions; -namespace Microsoft.PowerFx.Core.Public +namespace Microsoft.PowerFx { /// /// Information about a built-in function. diff --git a/src/libraries/Microsoft.PowerFx.Core/Public/IExpression.cs b/src/libraries/Microsoft.PowerFx.Core/Public/IExpression.cs index 8ea9b555d4..8f630eabc3 100644 --- a/src/libraries/Microsoft.PowerFx.Core/Public/IExpression.cs +++ b/src/libraries/Microsoft.PowerFx.Core/Public/IExpression.cs @@ -3,9 +3,9 @@ using System.Threading; using System.Threading.Tasks; -using Microsoft.PowerFx.Core.Public.Values; +using Microsoft.PowerFx.Types; -namespace Microsoft.PowerFx.Core.Public +namespace Microsoft.PowerFx { /// /// A parsed expression. diff --git a/src/libraries/Microsoft.PowerFx.Core/Public/IPowerFxEngine.cs b/src/libraries/Microsoft.PowerFx.Core/Public/IPowerFxEngine.cs index 4b5745c489..95cd787715 100644 --- a/src/libraries/Microsoft.PowerFx.Core/Public/IPowerFxEngine.cs +++ b/src/libraries/Microsoft.PowerFx.Core/Public/IPowerFxEngine.cs @@ -1,9 +1,9 @@ // Copyright (c) Microsoft Corporation. // Licensed under the MIT license. -using Microsoft.PowerFx.Core.Public.Types; +using Microsoft.PowerFx.Types; -namespace Microsoft.PowerFx.Core.Public +namespace Microsoft.PowerFx { /// /// Provide an interface to the RecalcEngine. diff --git a/src/libraries/Microsoft.PowerFx.Core/Public/IPowerFxScope.cs b/src/libraries/Microsoft.PowerFx.Core/Public/IPowerFxScope.cs index 30570b5325..319dd17e42 100644 --- a/src/libraries/Microsoft.PowerFx.Core/Public/IPowerFxScope.cs +++ b/src/libraries/Microsoft.PowerFx.Core/Public/IPowerFxScope.cs @@ -1,9 +1,7 @@ // Copyright (c) Microsoft Corporation. // Licensed under the MIT license. -using Microsoft.PowerFx.Core.Texl.Intellisense; - -namespace Microsoft.PowerFx.Core.Public +namespace Microsoft.PowerFx.Intellisense { /// /// Provide intellisense (Design-time) support. diff --git a/src/libraries/Microsoft.PowerFx.Core/Public/IPowerFxScopeDisplayName.cs b/src/libraries/Microsoft.PowerFx.Core/Public/IPowerFxScopeDisplayName.cs index 918bc478fc..fcb7eeaa0f 100644 --- a/src/libraries/Microsoft.PowerFx.Core/Public/IPowerFxScopeDisplayName.cs +++ b/src/libraries/Microsoft.PowerFx.Core/Public/IPowerFxScopeDisplayName.cs @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. // Licensed under the MIT license. -namespace Microsoft.PowerFx.Core.Public +namespace Microsoft.PowerFx.Intellisense { /// /// Provide display name translation. diff --git a/src/libraries/Microsoft.PowerFx.Core/Public/TokenResultType.cs b/src/libraries/Microsoft.PowerFx.Core/Public/TokenResultType.cs index 90b85b2624..4490bbc80d 100644 --- a/src/libraries/Microsoft.PowerFx.Core/Public/TokenResultType.cs +++ b/src/libraries/Microsoft.PowerFx.Core/Public/TokenResultType.cs @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. // Licensed under the MIT license. -namespace Microsoft.PowerFx.Core.Public +namespace Microsoft.PowerFx.Intellisense { /// /// Token result type (this matches formula bar token type defined in PowerAppsTheme.ts). diff --git a/src/libraries/Microsoft.PowerFx.Core/Public/Types/AggregateType.cs b/src/libraries/Microsoft.PowerFx.Core/Public/Types/AggregateType.cs index 938ec121cd..c43a1ef4ba 100644 --- a/src/libraries/Microsoft.PowerFx.Core/Public/Types/AggregateType.cs +++ b/src/libraries/Microsoft.PowerFx.Core/Public/Types/AggregateType.cs @@ -4,10 +4,11 @@ using System; using System.Collections.Generic; using System.Linq; +using Microsoft.PowerFx.Core; using Microsoft.PowerFx.Core.Types; using Microsoft.PowerFx.Core.Utils; -namespace Microsoft.PowerFx.Core.Public.Types +namespace Microsoft.PowerFx.Types { public abstract class AggregateType : FormulaType { diff --git a/src/libraries/Microsoft.PowerFx.Core/Public/Types/BindingErrorType.cs b/src/libraries/Microsoft.PowerFx.Core/Public/Types/BindingErrorType.cs index c9634981d9..e58c76f9ab 100644 --- a/src/libraries/Microsoft.PowerFx.Core/Public/Types/BindingErrorType.cs +++ b/src/libraries/Microsoft.PowerFx.Core/Public/Types/BindingErrorType.cs @@ -4,7 +4,7 @@ using System; using Microsoft.PowerFx.Core.Types; -namespace Microsoft.PowerFx.Core.Public.Types +namespace Microsoft.PowerFx.Types { /// /// A binding error type, attached to syntax nodes whose type is incorrect. diff --git a/src/libraries/Microsoft.PowerFx.Core/Public/Types/BlankType.cs b/src/libraries/Microsoft.PowerFx.Core/Public/Types/BlankType.cs index 2e4b3ff677..b9b18bea08 100644 --- a/src/libraries/Microsoft.PowerFx.Core/Public/Types/BlankType.cs +++ b/src/libraries/Microsoft.PowerFx.Core/Public/Types/BlankType.cs @@ -3,7 +3,7 @@ using Microsoft.PowerFx.Core.Types; -namespace Microsoft.PowerFx.Core.Public.Types +namespace Microsoft.PowerFx.Types { /// /// Represents a Blank (similar to Null) value. BlankType is compatible with other types. diff --git a/src/libraries/Microsoft.PowerFx.Core/Public/Types/BooleanType.cs b/src/libraries/Microsoft.PowerFx.Core/Public/Types/BooleanType.cs index e6a9ecb378..d297269fe7 100644 --- a/src/libraries/Microsoft.PowerFx.Core/Public/Types/BooleanType.cs +++ b/src/libraries/Microsoft.PowerFx.Core/Public/Types/BooleanType.cs @@ -3,7 +3,7 @@ using Microsoft.PowerFx.Core.Types; -namespace Microsoft.PowerFx.Core.Public.Types +namespace Microsoft.PowerFx.Types { public class BooleanType : FormulaType { diff --git a/src/libraries/Microsoft.PowerFx.Core/Public/Types/ColorType.cs b/src/libraries/Microsoft.PowerFx.Core/Public/Types/ColorType.cs index 9805658d8d..380ef2041a 100644 --- a/src/libraries/Microsoft.PowerFx.Core/Public/Types/ColorType.cs +++ b/src/libraries/Microsoft.PowerFx.Core/Public/Types/ColorType.cs @@ -4,7 +4,7 @@ using System; using Microsoft.PowerFx.Core.Types; -namespace Microsoft.PowerFx.Core.Public.Types +namespace Microsoft.PowerFx.Types { public class ColorType : FormulaType { diff --git a/src/libraries/Microsoft.PowerFx.Core/Public/Types/DateTimeNoTimeZoneType.cs b/src/libraries/Microsoft.PowerFx.Core/Public/Types/DateTimeNoTimeZoneType.cs index 9392751040..b450a4d8ab 100644 --- a/src/libraries/Microsoft.PowerFx.Core/Public/Types/DateTimeNoTimeZoneType.cs +++ b/src/libraries/Microsoft.PowerFx.Core/Public/Types/DateTimeNoTimeZoneType.cs @@ -4,7 +4,7 @@ using System.Diagnostics; using Microsoft.PowerFx.Core.Types; -namespace Microsoft.PowerFx.Core.Public.Types +namespace Microsoft.PowerFx.Types { [DebuggerDisplay("{_type}:tzi")] public class DateTimeNoTimeZoneType : FormulaType diff --git a/src/libraries/Microsoft.PowerFx.Core/Public/Types/DateTimeType.cs b/src/libraries/Microsoft.PowerFx.Core/Public/Types/DateTimeType.cs index 3b4e7d0d20..e75e64fd97 100644 --- a/src/libraries/Microsoft.PowerFx.Core/Public/Types/DateTimeType.cs +++ b/src/libraries/Microsoft.PowerFx.Core/Public/Types/DateTimeType.cs @@ -3,7 +3,7 @@ using Microsoft.PowerFx.Core.Types; -namespace Microsoft.PowerFx.Core.Public.Types +namespace Microsoft.PowerFx.Types { public class DateTimeType : FormulaType { diff --git a/src/libraries/Microsoft.PowerFx.Core/Public/Types/DateType.cs b/src/libraries/Microsoft.PowerFx.Core/Public/Types/DateType.cs index 22c1f9aa97..14d1604b93 100644 --- a/src/libraries/Microsoft.PowerFx.Core/Public/Types/DateType.cs +++ b/src/libraries/Microsoft.PowerFx.Core/Public/Types/DateType.cs @@ -3,7 +3,7 @@ using Microsoft.PowerFx.Core.Types; -namespace Microsoft.PowerFx.Core.Public.Types +namespace Microsoft.PowerFx.Types { public class DateType : FormulaType { diff --git a/src/libraries/Microsoft.PowerFx.Core/Public/Types/ExternalType.cs b/src/libraries/Microsoft.PowerFx.Core/Public/Types/ExternalType.cs index 9312b25200..d73087aa71 100644 --- a/src/libraries/Microsoft.PowerFx.Core/Public/Types/ExternalType.cs +++ b/src/libraries/Microsoft.PowerFx.Core/Public/Types/ExternalType.cs @@ -4,7 +4,7 @@ using System; using Microsoft.PowerFx.Core.Types; -namespace Microsoft.PowerFx.Core.Public.Types +namespace Microsoft.PowerFx.Types { /// /// This enum represents types which are not supported by PowerFx diff --git a/src/libraries/Microsoft.PowerFx.Core/Public/Types/FormulaType.cs b/src/libraries/Microsoft.PowerFx.Core/Public/Types/FormulaType.cs index 555c7c2185..c7fcd95922 100644 --- a/src/libraries/Microsoft.PowerFx.Core/Public/Types/FormulaType.cs +++ b/src/libraries/Microsoft.PowerFx.Core/Public/Types/FormulaType.cs @@ -8,7 +8,7 @@ using Microsoft.PowerFx.Core.Types; using Microsoft.PowerFx.Core.Utils; -namespace Microsoft.PowerFx.Core.Public.Types +namespace Microsoft.PowerFx.Types { /// /// Base class for type of a Formula. diff --git a/src/libraries/Microsoft.PowerFx.Core/Public/Types/GuidType.cs b/src/libraries/Microsoft.PowerFx.Core/Public/Types/GuidType.cs index 99256f7a5a..665fae12b6 100644 --- a/src/libraries/Microsoft.PowerFx.Core/Public/Types/GuidType.cs +++ b/src/libraries/Microsoft.PowerFx.Core/Public/Types/GuidType.cs @@ -4,7 +4,7 @@ using System; using Microsoft.PowerFx.Core.Types; -namespace Microsoft.PowerFx.Core.Public.Types +namespace Microsoft.PowerFx.Types { public class GuidType : FormulaType { diff --git a/src/libraries/Microsoft.PowerFx.Core/Public/Types/HyperlinkType.cs b/src/libraries/Microsoft.PowerFx.Core/Public/Types/HyperlinkType.cs index c4623746c9..5e7736304e 100644 --- a/src/libraries/Microsoft.PowerFx.Core/Public/Types/HyperlinkType.cs +++ b/src/libraries/Microsoft.PowerFx.Core/Public/Types/HyperlinkType.cs @@ -4,7 +4,7 @@ using System; using Microsoft.PowerFx.Core.Types; -namespace Microsoft.PowerFx.Core.Public.Types +namespace Microsoft.PowerFx.Types { public class HyperlinkType : FormulaType { diff --git a/src/libraries/Microsoft.PowerFx.Core/Public/Types/ITypeVistor.cs b/src/libraries/Microsoft.PowerFx.Core/Public/Types/ITypeVistor.cs index c2e2278932..b58190766c 100644 --- a/src/libraries/Microsoft.PowerFx.Core/Public/Types/ITypeVistor.cs +++ b/src/libraries/Microsoft.PowerFx.Core/Public/Types/ITypeVistor.cs @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. // Licensed under the MIT license. -namespace Microsoft.PowerFx.Core.Public.Types +namespace Microsoft.PowerFx.Types { /// /// Visitor for walking . diff --git a/src/libraries/Microsoft.PowerFx.Core/Public/Types/NamedFormulaType.cs b/src/libraries/Microsoft.PowerFx.Core/Public/Types/NamedFormulaType.cs index c66a8a91cb..3a48bcc494 100644 --- a/src/libraries/Microsoft.PowerFx.Core/Public/Types/NamedFormulaType.cs +++ b/src/libraries/Microsoft.PowerFx.Core/Public/Types/NamedFormulaType.cs @@ -4,7 +4,7 @@ using Microsoft.PowerFx.Core.Types; using Microsoft.PowerFx.Core.Utils; -namespace Microsoft.PowerFx.Core.Public.Types +namespace Microsoft.PowerFx.Types { // Useful for representing fields in an aggregate. public class NamedFormulaType diff --git a/src/libraries/Microsoft.PowerFx.Core/Public/Types/NumberType.cs b/src/libraries/Microsoft.PowerFx.Core/Public/Types/NumberType.cs index ebdb0f4964..f46d63b5da 100644 --- a/src/libraries/Microsoft.PowerFx.Core/Public/Types/NumberType.cs +++ b/src/libraries/Microsoft.PowerFx.Core/Public/Types/NumberType.cs @@ -3,7 +3,7 @@ using Microsoft.PowerFx.Core.Types; -namespace Microsoft.PowerFx.Core.Public.Types +namespace Microsoft.PowerFx.Types { public class NumberType : FormulaType { diff --git a/src/libraries/Microsoft.PowerFx.Core/Public/Types/OptionSetValueType.cs b/src/libraries/Microsoft.PowerFx.Core/Public/Types/OptionSetValueType.cs index 6321c0568d..6d78ba9fb2 100644 --- a/src/libraries/Microsoft.PowerFx.Core/Public/Types/OptionSetValueType.cs +++ b/src/libraries/Microsoft.PowerFx.Core/Public/Types/OptionSetValueType.cs @@ -1,15 +1,12 @@ // Copyright (c) Microsoft Corporation. // Licensed under the MIT license. -using System.Collections; using System.Collections.Generic; -using System.Linq; using Microsoft.PowerFx.Core.Entities; -using Microsoft.PowerFx.Core.Public.Values; using Microsoft.PowerFx.Core.Types; using Microsoft.PowerFx.Core.Utils; -namespace Microsoft.PowerFx.Core.Public.Types +namespace Microsoft.PowerFx.Types { /// /// Power Fx type for an enum-like things such as OptionSets. diff --git a/src/libraries/Microsoft.PowerFx.Core/Public/Types/RecordType.cs b/src/libraries/Microsoft.PowerFx.Core/Public/Types/RecordType.cs index 77b037eef3..9165fa094c 100644 --- a/src/libraries/Microsoft.PowerFx.Core/Public/Types/RecordType.cs +++ b/src/libraries/Microsoft.PowerFx.Core/Public/Types/RecordType.cs @@ -6,7 +6,7 @@ using Microsoft.PowerFx.Core.Types; using Microsoft.PowerFx.Core.Utils; -namespace Microsoft.PowerFx.Core.Public.Types +namespace Microsoft.PowerFx.Types { public class RecordType : AggregateType { diff --git a/src/libraries/Microsoft.PowerFx.Core/Public/Types/Serialization/FormulaTypeToSchemaConverter.cs b/src/libraries/Microsoft.PowerFx.Core/Public/Types/Serialization/FormulaTypeToSchemaConverter.cs index 5bdf17ae4c..9e960fa4ea 100644 --- a/src/libraries/Microsoft.PowerFx.Core/Public/Types/Serialization/FormulaTypeToSchemaConverter.cs +++ b/src/libraries/Microsoft.PowerFx.Core/Public/Types/Serialization/FormulaTypeToSchemaConverter.cs @@ -3,8 +3,7 @@ using System; using System.Collections.Generic; -using System.Text; -using Microsoft.PowerFx.Core.Public.Types; +using Microsoft.PowerFx.Types; namespace Microsoft.PowerFx.Core { diff --git a/src/libraries/Microsoft.PowerFx.Core/Public/Types/StringType.cs b/src/libraries/Microsoft.PowerFx.Core/Public/Types/StringType.cs index 954bc914d9..7927d8c258 100644 --- a/src/libraries/Microsoft.PowerFx.Core/Public/Types/StringType.cs +++ b/src/libraries/Microsoft.PowerFx.Core/Public/Types/StringType.cs @@ -3,7 +3,7 @@ using Microsoft.PowerFx.Core.Types; -namespace Microsoft.PowerFx.Core.Public.Types +namespace Microsoft.PowerFx.Types { public class StringType : FormulaType { diff --git a/src/libraries/Microsoft.PowerFx.Core/Public/Types/TableType.cs b/src/libraries/Microsoft.PowerFx.Core/Public/Types/TableType.cs index 84b8f5373e..6c3ebe648c 100644 --- a/src/libraries/Microsoft.PowerFx.Core/Public/Types/TableType.cs +++ b/src/libraries/Microsoft.PowerFx.Core/Public/Types/TableType.cs @@ -6,7 +6,7 @@ using Microsoft.PowerFx.Core.Types; using Microsoft.PowerFx.Core.Utils; -namespace Microsoft.PowerFx.Core.Public.Types +namespace Microsoft.PowerFx.Types { public class TableType : AggregateType { diff --git a/src/libraries/Microsoft.PowerFx.Core/Public/Types/TimeType.cs b/src/libraries/Microsoft.PowerFx.Core/Public/Types/TimeType.cs index f23f4b3a45..1e15f7bb7c 100644 --- a/src/libraries/Microsoft.PowerFx.Core/Public/Types/TimeType.cs +++ b/src/libraries/Microsoft.PowerFx.Core/Public/Types/TimeType.cs @@ -3,7 +3,7 @@ using Microsoft.PowerFx.Core.Types; -namespace Microsoft.PowerFx.Core.Public.Types +namespace Microsoft.PowerFx.Types { public class TimeType : FormulaType { diff --git a/src/libraries/Microsoft.PowerFx.Core/Public/Types/UnknownType.cs b/src/libraries/Microsoft.PowerFx.Core/Public/Types/UnknownType.cs index 279640a8de..7aa59697b7 100644 --- a/src/libraries/Microsoft.PowerFx.Core/Public/Types/UnknownType.cs +++ b/src/libraries/Microsoft.PowerFx.Core/Public/Types/UnknownType.cs @@ -3,7 +3,7 @@ using Microsoft.PowerFx.Core.Types; -namespace Microsoft.PowerFx.Core.Public.Types +namespace Microsoft.PowerFx.Types { /// /// An unknown type, attached to syntax nodes whose type cannot be determined. diff --git a/src/libraries/Microsoft.PowerFx.Core/Public/Types/UntypedObjectType.cs b/src/libraries/Microsoft.PowerFx.Core/Public/Types/UntypedObjectType.cs index 1c5176fc81..bfa6551858 100644 --- a/src/libraries/Microsoft.PowerFx.Core/Public/Types/UntypedObjectType.cs +++ b/src/libraries/Microsoft.PowerFx.Core/Public/Types/UntypedObjectType.cs @@ -6,7 +6,7 @@ using System.Text; using Microsoft.PowerFx.Core.Types; -namespace Microsoft.PowerFx.Core.Public.Types +namespace Microsoft.PowerFx.Types { public class UntypedObjectType : FormulaType { diff --git a/src/libraries/Microsoft.PowerFx.Core/Public/Values/BlankValue.cs b/src/libraries/Microsoft.PowerFx.Core/Public/Values/BlankValue.cs index e922684eae..33ccfa8f0a 100644 --- a/src/libraries/Microsoft.PowerFx.Core/Public/Values/BlankValue.cs +++ b/src/libraries/Microsoft.PowerFx.Core/Public/Values/BlankValue.cs @@ -4,7 +4,7 @@ using System.Diagnostics; using Microsoft.PowerFx.Core.IR; -namespace Microsoft.PowerFx.Core.Public.Values +namespace Microsoft.PowerFx.Types { [DebuggerDisplay("Blank() ({Type})")] public class BlankValue : FormulaValue @@ -29,4 +29,4 @@ public override void Visit(IValueVisitor visitor) visitor.Visit(this); } } -} \ No newline at end of file +} diff --git a/src/libraries/Microsoft.PowerFx.Core/Public/Values/BooleanValue.cs b/src/libraries/Microsoft.PowerFx.Core/Public/Values/BooleanValue.cs index 96cbd085c8..8d3b0a8fcd 100644 --- a/src/libraries/Microsoft.PowerFx.Core/Public/Values/BooleanValue.cs +++ b/src/libraries/Microsoft.PowerFx.Core/Public/Values/BooleanValue.cs @@ -3,9 +3,8 @@ using System.Diagnostics.Contracts; using Microsoft.PowerFx.Core.IR; -using Microsoft.PowerFx.Core.Public.Types; -namespace Microsoft.PowerFx.Core.Public.Values +namespace Microsoft.PowerFx.Types { public class BooleanValue : PrimitiveValue { diff --git a/src/libraries/Microsoft.PowerFx.Core/Public/Values/BuiltinFormulaTypeConversions.cs b/src/libraries/Microsoft.PowerFx.Core/Public/Values/BuiltinFormulaTypeConversions.cs index 99bf76d7be..0c274aa8a2 100644 --- a/src/libraries/Microsoft.PowerFx.Core/Public/Values/BuiltinFormulaTypeConversions.cs +++ b/src/libraries/Microsoft.PowerFx.Core/Public/Values/BuiltinFormulaTypeConversions.cs @@ -3,7 +3,7 @@ using System; using System.Collections.Generic; -using Microsoft.PowerFx.Core.Public.Types; +using Microsoft.PowerFx.Types; namespace Microsoft.PowerFx.Core { diff --git a/src/libraries/Microsoft.PowerFx.Core/Public/Values/CollectionTableValue.cs b/src/libraries/Microsoft.PowerFx.Core/Public/Values/CollectionTableValue.cs index 5012e7f4e8..5f9b5448ee 100644 --- a/src/libraries/Microsoft.PowerFx.Core/Public/Values/CollectionTableValue.cs +++ b/src/libraries/Microsoft.PowerFx.Core/Public/Values/CollectionTableValue.cs @@ -4,7 +4,7 @@ using System.Collections.Generic; using Microsoft.PowerFx.Core.IR; -namespace Microsoft.PowerFx.Core.Public.Values +namespace Microsoft.PowerFx.Types { /// /// Create a TableValue over a dotnet collection class. diff --git a/src/libraries/Microsoft.PowerFx.Core/Public/Values/ColorValue.cs b/src/libraries/Microsoft.PowerFx.Core/Public/Values/ColorValue.cs index 181b2eb266..48735cfdbd 100644 --- a/src/libraries/Microsoft.PowerFx.Core/Public/Values/ColorValue.cs +++ b/src/libraries/Microsoft.PowerFx.Core/Public/Values/ColorValue.cs @@ -4,9 +4,8 @@ using System.Diagnostics.Contracts; using System.Drawing; using Microsoft.PowerFx.Core.IR; -using Microsoft.PowerFx.Core.Public.Types; -namespace Microsoft.PowerFx.Core.Public.Values +namespace Microsoft.PowerFx.Types { public class ColorValue : PrimitiveValue { diff --git a/src/libraries/Microsoft.PowerFx.Core/Public/Values/CompileTimeTypeWrapperRecordValue.cs b/src/libraries/Microsoft.PowerFx.Core/Public/Values/CompileTimeTypeWrapperRecordValue.cs index 13e9a0e03d..e39c335ced 100644 --- a/src/libraries/Microsoft.PowerFx.Core/Public/Values/CompileTimeTypeWrapperRecordValue.cs +++ b/src/libraries/Microsoft.PowerFx.Core/Public/Values/CompileTimeTypeWrapperRecordValue.cs @@ -1,9 +1,7 @@ // Copyright (c) Microsoft Corporation. // Licensed under the MIT license. -using Microsoft.PowerFx.Core.Public.Types; - -namespace Microsoft.PowerFx.Core.Public.Values +namespace Microsoft.PowerFx.Types { // Project the correct compile-time type onto the runtime value. // Important for union / intersection types, such as Table() or If(). For example: diff --git a/src/libraries/Microsoft.PowerFx.Core/Public/Values/DValue.cs b/src/libraries/Microsoft.PowerFx.Core/Public/Values/DValue.cs index ea0874d3bf..8de2e8de56 100644 --- a/src/libraries/Microsoft.PowerFx.Core/Public/Values/DValue.cs +++ b/src/libraries/Microsoft.PowerFx.Core/Public/Values/DValue.cs @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. // Licensed under the MIT license. -namespace Microsoft.PowerFx.Core.Public.Values +namespace Microsoft.PowerFx.Types { /// /// Represents the type (T | Blank | Error), where T is neither Blank nor Error diff --git a/src/libraries/Microsoft.PowerFx.Core/Public/Values/DateTimeValue.cs b/src/libraries/Microsoft.PowerFx.Core/Public/Values/DateTimeValue.cs index aa76796a0f..bd9e9d26d4 100644 --- a/src/libraries/Microsoft.PowerFx.Core/Public/Values/DateTimeValue.cs +++ b/src/libraries/Microsoft.PowerFx.Core/Public/Values/DateTimeValue.cs @@ -4,9 +4,8 @@ using System; using System.Diagnostics.Contracts; using Microsoft.PowerFx.Core.IR; -using Microsoft.PowerFx.Core.Public.Types; -namespace Microsoft.PowerFx.Core.Public.Values +namespace Microsoft.PowerFx.Types { /// /// Represents a Date and Time together, in the local time zone. diff --git a/src/libraries/Microsoft.PowerFx.Core/Public/Values/DateValue.cs b/src/libraries/Microsoft.PowerFx.Core/Public/Values/DateValue.cs index 7709ebc125..3f2440884a 100644 --- a/src/libraries/Microsoft.PowerFx.Core/Public/Values/DateValue.cs +++ b/src/libraries/Microsoft.PowerFx.Core/Public/Values/DateValue.cs @@ -4,9 +4,8 @@ using System; using System.Diagnostics.Contracts; using Microsoft.PowerFx.Core.IR; -using Microsoft.PowerFx.Core.Public.Types; -namespace Microsoft.PowerFx.Core.Public.Values +namespace Microsoft.PowerFx.Types { /// /// Represents a Date only, without a time component, in the local time zone. diff --git a/src/libraries/Microsoft.PowerFx.Core/Public/Values/ErrorValue.cs b/src/libraries/Microsoft.PowerFx.Core/Public/Values/ErrorValue.cs index 593e9e6bbe..1cb8542450 100644 --- a/src/libraries/Microsoft.PowerFx.Core/Public/Values/ErrorValue.cs +++ b/src/libraries/Microsoft.PowerFx.Core/Public/Values/ErrorValue.cs @@ -4,7 +4,7 @@ using System.Collections.Generic; using Microsoft.PowerFx.Core.IR; -namespace Microsoft.PowerFx.Core.Public.Values +namespace Microsoft.PowerFx.Types { /// /// A Runtime error. diff --git a/src/libraries/Microsoft.PowerFx.Core/Public/Values/FormulaValue.cs b/src/libraries/Microsoft.PowerFx.Core/Public/Values/FormulaValue.cs index 5360147f1e..f07c469840 100644 --- a/src/libraries/Microsoft.PowerFx.Core/Public/Values/FormulaValue.cs +++ b/src/libraries/Microsoft.PowerFx.Core/Public/Values/FormulaValue.cs @@ -9,9 +9,8 @@ using System.Linq; using System.Reflection; using Microsoft.PowerFx.Core.IR; -using Microsoft.PowerFx.Core.Public.Types; -namespace Microsoft.PowerFx.Core.Public.Values +namespace Microsoft.PowerFx.Types { /// /// Represent a value in the formula expression. diff --git a/src/libraries/Microsoft.PowerFx.Core/Public/Values/FormulaValueNew.cs b/src/libraries/Microsoft.PowerFx.Core/Public/Values/FormulaValueNew.cs index 6d9d935d8e..66660d840e 100644 --- a/src/libraries/Microsoft.PowerFx.Core/Public/Values/FormulaValueNew.cs +++ b/src/libraries/Microsoft.PowerFx.Core/Public/Values/FormulaValueNew.cs @@ -3,9 +3,8 @@ using System; using Microsoft.PowerFx.Core.IR; -using Microsoft.PowerFx.Core.Public.Types; -namespace Microsoft.PowerFx.Core.Public.Values +namespace Microsoft.PowerFx.Types { // Basc new operators. public partial class FormulaValue diff --git a/src/libraries/Microsoft.PowerFx.Core/Public/Values/FormulaValueNewJson.cs b/src/libraries/Microsoft.PowerFx.Core/Public/Values/FormulaValueNewJson.cs index c18e1b4242..30c6c9376c 100644 --- a/src/libraries/Microsoft.PowerFx.Core/Public/Values/FormulaValueNewJson.cs +++ b/src/libraries/Microsoft.PowerFx.Core/Public/Values/FormulaValueNewJson.cs @@ -10,9 +10,8 @@ using System.Reflection; using System.Text.Json; using Microsoft.PowerFx.Core.IR; -using Microsoft.PowerFx.Core.Public.Types; -namespace Microsoft.PowerFx.Core.Public.Values +namespace Microsoft.PowerFx.Types { // Marshalling from Json. These are convenience operations. public partial class FormulaValue diff --git a/src/libraries/Microsoft.PowerFx.Core/Public/Values/FormulaValueNewRecord.cs b/src/libraries/Microsoft.PowerFx.Core/Public/Values/FormulaValueNewRecord.cs index 8b9eca908e..f2631c242c 100644 --- a/src/libraries/Microsoft.PowerFx.Core/Public/Values/FormulaValueNewRecord.cs +++ b/src/libraries/Microsoft.PowerFx.Core/Public/Values/FormulaValueNewRecord.cs @@ -10,9 +10,8 @@ using System.Reflection; using System.Text.Json; using Microsoft.PowerFx.Core.IR; -using Microsoft.PowerFx.Core.Public.Types; -namespace Microsoft.PowerFx.Core.Public.Values +namespace Microsoft.PowerFx.Types { // Helpers for creating tables from records. // For marshalling a dotnet object (T) to a Table, see TypeMarshallerCache.. diff --git a/src/libraries/Microsoft.PowerFx.Core/Public/Values/FormulaValueNewTable.cs b/src/libraries/Microsoft.PowerFx.Core/Public/Values/FormulaValueNewTable.cs index 0b45accd08..d2fd0b9295 100644 --- a/src/libraries/Microsoft.PowerFx.Core/Public/Values/FormulaValueNewTable.cs +++ b/src/libraries/Microsoft.PowerFx.Core/Public/Values/FormulaValueNewTable.cs @@ -11,9 +11,8 @@ using System.Text.Json; using Microsoft.PowerFx.Core; using Microsoft.PowerFx.Core.IR; -using Microsoft.PowerFx.Core.Public.Types; -namespace Microsoft.PowerFx.Core.Public.Values +namespace Microsoft.PowerFx.Types { // Marshalling a tables. // Tables need to know their record type. diff --git a/src/libraries/Microsoft.PowerFx.Core/Public/Values/GuidValue.cs b/src/libraries/Microsoft.PowerFx.Core/Public/Values/GuidValue.cs index 7bc19983dd..b48b9d0072 100644 --- a/src/libraries/Microsoft.PowerFx.Core/Public/Values/GuidValue.cs +++ b/src/libraries/Microsoft.PowerFx.Core/Public/Values/GuidValue.cs @@ -4,9 +4,8 @@ using System; using System.Diagnostics.Contracts; using Microsoft.PowerFx.Core.IR; -using Microsoft.PowerFx.Core.Public.Types; -namespace Microsoft.PowerFx.Core.Public.Values +namespace Microsoft.PowerFx.Types { public class GuidValue : PrimitiveValue { diff --git a/src/libraries/Microsoft.PowerFx.Core/Public/Values/IValueVisitor.cs b/src/libraries/Microsoft.PowerFx.Core/Public/Values/IValueVisitor.cs index 5cecf8b180..74a49c2aef 100644 --- a/src/libraries/Microsoft.PowerFx.Core/Public/Values/IValueVisitor.cs +++ b/src/libraries/Microsoft.PowerFx.Core/Public/Values/IValueVisitor.cs @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. // Licensed under the MIT license. -namespace Microsoft.PowerFx.Core.Public.Values +namespace Microsoft.PowerFx.Types { public interface IValueVisitor { diff --git a/src/libraries/Microsoft.PowerFx.Core/Public/Values/InMemoryRecordValue.cs b/src/libraries/Microsoft.PowerFx.Core/Public/Values/InMemoryRecordValue.cs index 3157a20b65..166ac6b5dd 100644 --- a/src/libraries/Microsoft.PowerFx.Core/Public/Values/InMemoryRecordValue.cs +++ b/src/libraries/Microsoft.PowerFx.Core/Public/Values/InMemoryRecordValue.cs @@ -5,9 +5,8 @@ using System.Collections.Generic; using System.Diagnostics.Contracts; using Microsoft.PowerFx.Core.IR; -using Microsoft.PowerFx.Core.Public.Types; -namespace Microsoft.PowerFx.Core.Public.Values +namespace Microsoft.PowerFx.Types { // Represent record backed by known list of values. internal class InMemoryRecordValue : RecordValue diff --git a/src/libraries/Microsoft.PowerFx.Core/Public/Values/InMemoryTableValue.cs b/src/libraries/Microsoft.PowerFx.Core/Public/Values/InMemoryTableValue.cs index a1fb7a55aa..a866734226 100644 --- a/src/libraries/Microsoft.PowerFx.Core/Public/Values/InMemoryTableValue.cs +++ b/src/libraries/Microsoft.PowerFx.Core/Public/Values/InMemoryTableValue.cs @@ -1,14 +1,11 @@ // Copyright (c) Microsoft Corporation. // Licensed under the MIT license. -using System; using System.Collections.Generic; using System.Diagnostics.Contracts; -using System.Linq; using Microsoft.PowerFx.Core.IR; -using Microsoft.PowerFx.Core.Public.Types; -namespace Microsoft.PowerFx.Core.Public.Values +namespace Microsoft.PowerFx.Types { /// /// In-memory table. Constructed over RecordValues. diff --git a/src/libraries/Microsoft.PowerFx.Core/Public/Values/NamedValue.cs b/src/libraries/Microsoft.PowerFx.Core/Public/Values/NamedValue.cs index 4e68c525c4..737c955bae 100644 --- a/src/libraries/Microsoft.PowerFx.Core/Public/Values/NamedValue.cs +++ b/src/libraries/Microsoft.PowerFx.Core/Public/Values/NamedValue.cs @@ -4,7 +4,7 @@ using System; using System.Collections.Generic; -namespace Microsoft.PowerFx.Core.Public.Values +namespace Microsoft.PowerFx.Types { /// /// Helper class for representing fields or columns. diff --git a/src/libraries/Microsoft.PowerFx.Core/Public/Values/NumberValue.cs b/src/libraries/Microsoft.PowerFx.Core/Public/Values/NumberValue.cs index c9ed24fff6..d9e0666f3d 100644 --- a/src/libraries/Microsoft.PowerFx.Core/Public/Values/NumberValue.cs +++ b/src/libraries/Microsoft.PowerFx.Core/Public/Values/NumberValue.cs @@ -3,9 +3,8 @@ using System.Diagnostics.Contracts; using Microsoft.PowerFx.Core.IR; -using Microsoft.PowerFx.Core.Public.Types; -namespace Microsoft.PowerFx.Core.Public.Values +namespace Microsoft.PowerFx.Types { public class NumberValue : PrimitiveValue { diff --git a/src/libraries/Microsoft.PowerFx.Core/Public/Values/OptionSetValue.cs b/src/libraries/Microsoft.PowerFx.Core/Public/Values/OptionSetValue.cs index ac10a348b8..1247a8b1d0 100644 --- a/src/libraries/Microsoft.PowerFx.Core/Public/Values/OptionSetValue.cs +++ b/src/libraries/Microsoft.PowerFx.Core/Public/Values/OptionSetValue.cs @@ -1,15 +1,11 @@ // Copyright (c) Microsoft Corporation. // Licensed under the MIT license. -using System; -using System.Collections.Generic; using System.Diagnostics; -using System.Text; using Microsoft.PowerFx.Core.IR; -using Microsoft.PowerFx.Core.Public.Types; using Microsoft.PowerFx.Core.Utils; -namespace Microsoft.PowerFx.Core.Public.Values +namespace Microsoft.PowerFx.Types { /// /// A value within an option set. diff --git a/src/libraries/Microsoft.PowerFx.Core/Public/Values/PrimitiveValue.cs b/src/libraries/Microsoft.PowerFx.Core/Public/Values/PrimitiveValue.cs index c84fece6f6..d6685c8931 100644 --- a/src/libraries/Microsoft.PowerFx.Core/Public/Values/PrimitiveValue.cs +++ b/src/libraries/Microsoft.PowerFx.Core/Public/Values/PrimitiveValue.cs @@ -1,13 +1,11 @@ // Copyright (c) Microsoft Corporation. // Licensed under the MIT license. -using System; -using System.Collections.Generic; using System.Diagnostics.Contracts; +using Microsoft.PowerFx.Core; using Microsoft.PowerFx.Core.IR; -using Microsoft.PowerFx.Core.Public.Types; -namespace Microsoft.PowerFx.Core.Public.Values +namespace Microsoft.PowerFx.Types { /// /// Helper for non-aggregate values that are represented as a single .net object. diff --git a/src/libraries/Microsoft.PowerFx.Core/Public/Values/RecordValue.cs b/src/libraries/Microsoft.PowerFx.Core/Public/Values/RecordValue.cs index 2e54ee071f..933a330e1f 100644 --- a/src/libraries/Microsoft.PowerFx.Core/Public/Values/RecordValue.cs +++ b/src/libraries/Microsoft.PowerFx.Core/Public/Values/RecordValue.cs @@ -6,9 +6,8 @@ using System.Diagnostics.Contracts; using System.Dynamic; using Microsoft.PowerFx.Core.IR; -using Microsoft.PowerFx.Core.Public.Types; -namespace Microsoft.PowerFx.Core.Public.Values +namespace Microsoft.PowerFx.Types { /// /// Represent a Record. Records have named fields which can be other values. diff --git a/src/libraries/Microsoft.PowerFx.Core/Public/Values/StringValue.cs b/src/libraries/Microsoft.PowerFx.Core/Public/Values/StringValue.cs index 8213497dbf..048c9924f0 100644 --- a/src/libraries/Microsoft.PowerFx.Core/Public/Values/StringValue.cs +++ b/src/libraries/Microsoft.PowerFx.Core/Public/Values/StringValue.cs @@ -3,9 +3,8 @@ using System.Diagnostics.Contracts; using Microsoft.PowerFx.Core.IR; -using Microsoft.PowerFx.Core.Public.Types; -namespace Microsoft.PowerFx.Core.Public.Values +namespace Microsoft.PowerFx.Types { public class StringValue : PrimitiveValue { diff --git a/src/libraries/Microsoft.PowerFx.Core/Public/Values/TableValue.cs b/src/libraries/Microsoft.PowerFx.Core/Public/Values/TableValue.cs index 1a28fc6d37..6fa7e99def 100644 --- a/src/libraries/Microsoft.PowerFx.Core/Public/Values/TableValue.cs +++ b/src/libraries/Microsoft.PowerFx.Core/Public/Values/TableValue.cs @@ -5,10 +5,9 @@ using System.Diagnostics.Contracts; using System.Linq; using Microsoft.PowerFx.Core.IR; -using Microsoft.PowerFx.Core.Public.Types; using Microsoft.PowerFx.Core.Utils; -namespace Microsoft.PowerFx.Core.Public.Values +namespace Microsoft.PowerFx.Types { /// /// Represents a table (both single columna and multi-column). diff --git a/src/libraries/Microsoft.PowerFx.Core/Public/Values/TimeValue.cs b/src/libraries/Microsoft.PowerFx.Core/Public/Values/TimeValue.cs index bcaab00ad0..fcce9f760b 100644 --- a/src/libraries/Microsoft.PowerFx.Core/Public/Values/TimeValue.cs +++ b/src/libraries/Microsoft.PowerFx.Core/Public/Values/TimeValue.cs @@ -4,9 +4,8 @@ using System; using System.Diagnostics.Contracts; using Microsoft.PowerFx.Core.IR; -using Microsoft.PowerFx.Core.Public.Types; -namespace Microsoft.PowerFx.Core.Public.Values +namespace Microsoft.PowerFx.Types { public class TimeValue : PrimitiveValue { diff --git a/src/libraries/Microsoft.PowerFx.Core/Public/Values/UntypedObjectValue.cs b/src/libraries/Microsoft.PowerFx.Core/Public/Values/UntypedObjectValue.cs index 44b660eb54..864be639c5 100644 --- a/src/libraries/Microsoft.PowerFx.Core/Public/Values/UntypedObjectValue.cs +++ b/src/libraries/Microsoft.PowerFx.Core/Public/Values/UntypedObjectValue.cs @@ -8,9 +8,8 @@ using System.Text; using System.Text.Json; using Microsoft.PowerFx.Core.IR; -using Microsoft.PowerFx.Core.Public.Types; -namespace Microsoft.PowerFx.Core.Public.Values +namespace Microsoft.PowerFx.Types { /// /// The backing implementation for UntypedObjectValue, for example Json, Xml, diff --git a/src/libraries/Microsoft.PowerFx.Core/Public/Values/ValidFormulaValue.cs b/src/libraries/Microsoft.PowerFx.Core/Public/Values/ValidFormulaValue.cs index be0390908c..73aa33b79e 100644 --- a/src/libraries/Microsoft.PowerFx.Core/Public/Values/ValidFormulaValue.cs +++ b/src/libraries/Microsoft.PowerFx.Core/Public/Values/ValidFormulaValue.cs @@ -3,7 +3,7 @@ using Microsoft.PowerFx.Core.IR; -namespace Microsoft.PowerFx.Core.Public.Values +namespace Microsoft.PowerFx.Types { /// /// All values except BlankValue and ErrorValue should inherit from this base class. diff --git a/src/libraries/Microsoft.PowerFx.Core/Syntax/Formula.cs b/src/libraries/Microsoft.PowerFx.Core/Syntax/Formula.cs index 352e55e3dd..8ee75fa2eb 100644 --- a/src/libraries/Microsoft.PowerFx.Core/Syntax/Formula.cs +++ b/src/libraries/Microsoft.PowerFx.Core/Syntax/Formula.cs @@ -4,14 +4,13 @@ using System.Collections.Generic; using System.Linq; using Microsoft.PowerFx.Core.Errors; -using Microsoft.PowerFx.Core.Lexer.Tokens; using Microsoft.PowerFx.Core.Localization; using Microsoft.PowerFx.Core.Parser; -using Microsoft.PowerFx.Core.Syntax.Nodes; using Microsoft.PowerFx.Core.Utils; +using Microsoft.PowerFx.Syntax; using Conditional = System.Diagnostics.ConditionalAttribute; -namespace Microsoft.PowerFx.Core.Syntax +namespace Microsoft.PowerFx.Syntax { /// /// This encapsulates a Texl formula, its parse tree and any parse errors. Note that diff --git a/src/libraries/Microsoft.PowerFx.Core/Syntax/Identifier.cs b/src/libraries/Microsoft.PowerFx.Core/Syntax/Identifier.cs index fffc35b66f..1b8735ad41 100644 --- a/src/libraries/Microsoft.PowerFx.Core/Syntax/Identifier.cs +++ b/src/libraries/Microsoft.PowerFx.Core/Syntax/Identifier.cs @@ -1,11 +1,11 @@ // Copyright (c) Microsoft Corporation. // Licensed under the MIT license. -using Microsoft.PowerFx.Core.Lexer.Tokens; using Microsoft.PowerFx.Core.Localization; using Microsoft.PowerFx.Core.Utils; +using Microsoft.PowerFx.Syntax; -namespace Microsoft.PowerFx.Core.Syntax +namespace Microsoft.PowerFx.Syntax { /// /// The identifier during parsing. diff --git a/src/libraries/Microsoft.PowerFx.Core/Syntax/NamedFormulas.cs b/src/libraries/Microsoft.PowerFx.Core/Syntax/NamedFormulas.cs index a0c6f548f7..6d8c19f55d 100644 --- a/src/libraries/Microsoft.PowerFx.Core/Syntax/NamedFormulas.cs +++ b/src/libraries/Microsoft.PowerFx.Core/Syntax/NamedFormulas.cs @@ -5,13 +5,12 @@ using System.Collections.Generic; using System.Linq; using Microsoft.PowerFx.Core.Errors; -using Microsoft.PowerFx.Core.Lexer.Tokens; using Microsoft.PowerFx.Core.Localization; using Microsoft.PowerFx.Core.Parser; -using Microsoft.PowerFx.Core.Syntax.Nodes; using Microsoft.PowerFx.Core.Utils; +using Microsoft.PowerFx.Syntax; -namespace Microsoft.PowerFx.Core.Syntax +namespace Microsoft.PowerFx.Syntax { /// /// This encapsulates a named formula: its original script, the parsed result, and any parse errors. diff --git a/src/libraries/Microsoft.PowerFx.Core/Syntax/NodeKind.cs b/src/libraries/Microsoft.PowerFx.Core/Syntax/NodeKind.cs index 9ac1df3390..e34c815336 100644 --- a/src/libraries/Microsoft.PowerFx.Core/Syntax/NodeKind.cs +++ b/src/libraries/Microsoft.PowerFx.Core/Syntax/NodeKind.cs @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. // Licensed under the MIT license. -namespace Microsoft.PowerFx.Core.Syntax +namespace Microsoft.PowerFx.Syntax { // Node kinds. Primarily used by Intellisense. public enum NodeKind diff --git a/src/libraries/Microsoft.PowerFx.Core/Syntax/Nodes/AsNode.cs b/src/libraries/Microsoft.PowerFx.Core/Syntax/Nodes/AsNode.cs index 1a260852ef..7ff109909f 100644 --- a/src/libraries/Microsoft.PowerFx.Core/Syntax/Nodes/AsNode.cs +++ b/src/libraries/Microsoft.PowerFx.Core/Syntax/Nodes/AsNode.cs @@ -2,13 +2,12 @@ // Licensed under the MIT license. using System.Collections.Generic; -using Microsoft.PowerFx.Core.Lexer.Tokens; using Microsoft.PowerFx.Core.Localization; -using Microsoft.PowerFx.Core.Syntax.SourceInformation; -using Microsoft.PowerFx.Core.Syntax.Visitors; using Microsoft.PowerFx.Core.Utils; +using Microsoft.PowerFx.Syntax; +using Microsoft.PowerFx.Syntax.SourceInformation; -namespace Microsoft.PowerFx.Core.Syntax.Nodes +namespace Microsoft.PowerFx.Syntax { /// /// As operator parse node. Example: diff --git a/src/libraries/Microsoft.PowerFx.Core/Syntax/Nodes/BinaryOpNode.cs b/src/libraries/Microsoft.PowerFx.Core/Syntax/Nodes/BinaryOpNode.cs index 78c9e70077..037f471e98 100644 --- a/src/libraries/Microsoft.PowerFx.Core/Syntax/Nodes/BinaryOpNode.cs +++ b/src/libraries/Microsoft.PowerFx.Core/Syntax/Nodes/BinaryOpNode.cs @@ -3,14 +3,12 @@ using System; using System.Collections.Generic; -using Microsoft.PowerFx.Core.Lexer; -using Microsoft.PowerFx.Core.Lexer.Tokens; using Microsoft.PowerFx.Core.Localization; -using Microsoft.PowerFx.Core.Syntax.SourceInformation; -using Microsoft.PowerFx.Core.Syntax.Visitors; using Microsoft.PowerFx.Core.Utils; +using Microsoft.PowerFx.Syntax; +using Microsoft.PowerFx.Syntax.SourceInformation; -namespace Microsoft.PowerFx.Core.Syntax.Nodes +namespace Microsoft.PowerFx.Syntax { /// /// Binary operation parse node. Example: diff --git a/src/libraries/Microsoft.PowerFx.Core/Syntax/Nodes/BlankNode.cs b/src/libraries/Microsoft.PowerFx.Core/Syntax/Nodes/BlankNode.cs index bb0ca384bd..5b17a755d4 100644 --- a/src/libraries/Microsoft.PowerFx.Core/Syntax/Nodes/BlankNode.cs +++ b/src/libraries/Microsoft.PowerFx.Core/Syntax/Nodes/BlankNode.cs @@ -1,13 +1,12 @@ // Copyright (c) Microsoft Corporation. // Licensed under the MIT license. -using Microsoft.PowerFx.Core.Lexer.Tokens; using Microsoft.PowerFx.Core.Localization; -using Microsoft.PowerFx.Core.Syntax.SourceInformation; -using Microsoft.PowerFx.Core.Syntax.Visitors; using Microsoft.PowerFx.Core.Utils; +using Microsoft.PowerFx.Syntax; +using Microsoft.PowerFx.Syntax.SourceInformation; -namespace Microsoft.PowerFx.Core.Syntax.Nodes +namespace Microsoft.PowerFx.Syntax { public sealed class BlankNode : TexlNode { diff --git a/src/libraries/Microsoft.PowerFx.Core/Syntax/Nodes/BoolLitNode.cs b/src/libraries/Microsoft.PowerFx.Core/Syntax/Nodes/BoolLitNode.cs index fceae7cb67..7ab5317c6b 100644 --- a/src/libraries/Microsoft.PowerFx.Core/Syntax/Nodes/BoolLitNode.cs +++ b/src/libraries/Microsoft.PowerFx.Core/Syntax/Nodes/BoolLitNode.cs @@ -1,14 +1,12 @@ // Copyright (c) Microsoft Corporation. // Licensed under the MIT license. -using Microsoft.PowerFx.Core.Lexer; -using Microsoft.PowerFx.Core.Lexer.Tokens; using Microsoft.PowerFx.Core.Localization; -using Microsoft.PowerFx.Core.Syntax.SourceInformation; -using Microsoft.PowerFx.Core.Syntax.Visitors; using Microsoft.PowerFx.Core.Utils; +using Microsoft.PowerFx.Syntax; +using Microsoft.PowerFx.Syntax.SourceInformation; -namespace Microsoft.PowerFx.Core.Syntax.Nodes +namespace Microsoft.PowerFx.Syntax { /// /// Boolean literal parse node (true, false). diff --git a/src/libraries/Microsoft.PowerFx.Core/Syntax/Nodes/CallNode.cs b/src/libraries/Microsoft.PowerFx.Core/Syntax/Nodes/CallNode.cs index e28bf09694..d3aac1c0ab 100644 --- a/src/libraries/Microsoft.PowerFx.Core/Syntax/Nodes/CallNode.cs +++ b/src/libraries/Microsoft.PowerFx.Core/Syntax/Nodes/CallNode.cs @@ -6,13 +6,12 @@ using System.Linq; using System.Threading; using Microsoft.PowerFx.Core.Binding; -using Microsoft.PowerFx.Core.Lexer.Tokens; using Microsoft.PowerFx.Core.Localization; -using Microsoft.PowerFx.Core.Syntax.SourceInformation; -using Microsoft.PowerFx.Core.Syntax.Visitors; using Microsoft.PowerFx.Core.Utils; +using Microsoft.PowerFx.Syntax; +using Microsoft.PowerFx.Syntax.SourceInformation; -namespace Microsoft.PowerFx.Core.Syntax.Nodes +namespace Microsoft.PowerFx.Syntax { /// /// Function call parse node. Example: diff --git a/src/libraries/Microsoft.PowerFx.Core/Syntax/Nodes/DottedNameNode.cs b/src/libraries/Microsoft.PowerFx.Core/Syntax/Nodes/DottedNameNode.cs index ab922ea12b..dc47bcbbf8 100644 --- a/src/libraries/Microsoft.PowerFx.Core/Syntax/Nodes/DottedNameNode.cs +++ b/src/libraries/Microsoft.PowerFx.Core/Syntax/Nodes/DottedNameNode.cs @@ -3,14 +3,12 @@ using System; using System.Collections.Generic; -using Microsoft.PowerFx.Core.Lexer; -using Microsoft.PowerFx.Core.Lexer.Tokens; using Microsoft.PowerFx.Core.Localization; -using Microsoft.PowerFx.Core.Syntax.SourceInformation; -using Microsoft.PowerFx.Core.Syntax.Visitors; using Microsoft.PowerFx.Core.Utils; +using Microsoft.PowerFx.Syntax; +using Microsoft.PowerFx.Syntax.SourceInformation; -namespace Microsoft.PowerFx.Core.Syntax.Nodes +namespace Microsoft.PowerFx.Syntax { /// /// Dotted identifier name parse node. Example: diff --git a/src/libraries/Microsoft.PowerFx.Core/Syntax/Nodes/ErrorNode.cs b/src/libraries/Microsoft.PowerFx.Core/Syntax/Nodes/ErrorNode.cs index 1552591804..0cca6754e5 100644 --- a/src/libraries/Microsoft.PowerFx.Core/Syntax/Nodes/ErrorNode.cs +++ b/src/libraries/Microsoft.PowerFx.Core/Syntax/Nodes/ErrorNode.cs @@ -1,13 +1,12 @@ // Copyright (c) Microsoft Corporation. // Licensed under the MIT license. -using Microsoft.PowerFx.Core.Lexer.Tokens; using Microsoft.PowerFx.Core.Localization; -using Microsoft.PowerFx.Core.Syntax.SourceInformation; -using Microsoft.PowerFx.Core.Syntax.Visitors; using Microsoft.PowerFx.Core.Utils; +using Microsoft.PowerFx.Syntax; +using Microsoft.PowerFx.Syntax.SourceInformation; -namespace Microsoft.PowerFx.Core.Syntax.Nodes +namespace Microsoft.PowerFx.Syntax { /// /// Error parse node. diff --git a/src/libraries/Microsoft.PowerFx.Core/Syntax/Nodes/FirstNameNode.cs b/src/libraries/Microsoft.PowerFx.Core/Syntax/Nodes/FirstNameNode.cs index 275b1715aa..834249117d 100644 --- a/src/libraries/Microsoft.PowerFx.Core/Syntax/Nodes/FirstNameNode.cs +++ b/src/libraries/Microsoft.PowerFx.Core/Syntax/Nodes/FirstNameNode.cs @@ -1,13 +1,12 @@ // Copyright (c) Microsoft Corporation. // Licensed under the MIT license. -using Microsoft.PowerFx.Core.Lexer.Tokens; using Microsoft.PowerFx.Core.Localization; -using Microsoft.PowerFx.Core.Syntax.SourceInformation; -using Microsoft.PowerFx.Core.Syntax.Visitors; using Microsoft.PowerFx.Core.Utils; +using Microsoft.PowerFx.Syntax; +using Microsoft.PowerFx.Syntax.SourceInformation; -namespace Microsoft.PowerFx.Core.Syntax.Nodes +namespace Microsoft.PowerFx.Syntax { /// /// First name parse node. Example: diff --git a/src/libraries/Microsoft.PowerFx.Core/Syntax/Nodes/ListNode.cs b/src/libraries/Microsoft.PowerFx.Core/Syntax/Nodes/ListNode.cs index 2b9ddc0167..798d668cbb 100644 --- a/src/libraries/Microsoft.PowerFx.Core/Syntax/Nodes/ListNode.cs +++ b/src/libraries/Microsoft.PowerFx.Core/Syntax/Nodes/ListNode.cs @@ -2,13 +2,12 @@ // Licensed under the MIT license. using System.Collections.Generic; -using Microsoft.PowerFx.Core.Lexer.Tokens; using Microsoft.PowerFx.Core.Localization; -using Microsoft.PowerFx.Core.Syntax.SourceInformation; -using Microsoft.PowerFx.Core.Syntax.Visitors; using Microsoft.PowerFx.Core.Utils; +using Microsoft.PowerFx.Syntax; +using Microsoft.PowerFx.Syntax.SourceInformation; -namespace Microsoft.PowerFx.Core.Syntax.Nodes +namespace Microsoft.PowerFx.Syntax { /// /// List expression parse node. Example: diff --git a/src/libraries/Microsoft.PowerFx.Core/Syntax/Nodes/NameNode.cs b/src/libraries/Microsoft.PowerFx.Core/Syntax/Nodes/NameNode.cs index 78b038cf74..0b5407d0ea 100644 --- a/src/libraries/Microsoft.PowerFx.Core/Syntax/Nodes/NameNode.cs +++ b/src/libraries/Microsoft.PowerFx.Core/Syntax/Nodes/NameNode.cs @@ -2,11 +2,10 @@ // Licensed under the MIT license. using System.Linq; -using Microsoft.PowerFx.Core.Lexer.Tokens; using Microsoft.PowerFx.Core.Localization; -using Microsoft.PowerFx.Core.Syntax.SourceInformation; +using Microsoft.PowerFx.Syntax.SourceInformation; -namespace Microsoft.PowerFx.Core.Syntax.Nodes +namespace Microsoft.PowerFx.Syntax { /// /// Base class for all parse nodes representing a name/identifier. diff --git a/src/libraries/Microsoft.PowerFx.Core/Syntax/Nodes/NumLitNode.cs b/src/libraries/Microsoft.PowerFx.Core/Syntax/Nodes/NumLitNode.cs index f8b351b3e4..ab8f5a8bfa 100644 --- a/src/libraries/Microsoft.PowerFx.Core/Syntax/Nodes/NumLitNode.cs +++ b/src/libraries/Microsoft.PowerFx.Core/Syntax/Nodes/NumLitNode.cs @@ -1,14 +1,11 @@ // Copyright (c) Microsoft Corporation. // Licensed under the MIT license. -using Microsoft.PowerFx.Core.Lexer; -using Microsoft.PowerFx.Core.Lexer.Tokens; using Microsoft.PowerFx.Core.Localization; -using Microsoft.PowerFx.Core.Syntax.SourceInformation; -using Microsoft.PowerFx.Core.Syntax.Visitors; using Microsoft.PowerFx.Core.Utils; +using Microsoft.PowerFx.Syntax.SourceInformation; -namespace Microsoft.PowerFx.Core.Syntax.Nodes +namespace Microsoft.PowerFx.Syntax { /// /// Numeric literal parse node. Example: diff --git a/src/libraries/Microsoft.PowerFx.Core/Syntax/Nodes/ParentNode.cs b/src/libraries/Microsoft.PowerFx.Core/Syntax/Nodes/ParentNode.cs index bbe3821ff9..6dd1ec78e0 100644 --- a/src/libraries/Microsoft.PowerFx.Core/Syntax/Nodes/ParentNode.cs +++ b/src/libraries/Microsoft.PowerFx.Core/Syntax/Nodes/ParentNode.cs @@ -1,13 +1,12 @@ // Copyright (c) Microsoft Corporation. // Licensed under the MIT license. -using Microsoft.PowerFx.Core.Lexer.Tokens; using Microsoft.PowerFx.Core.Localization; -using Microsoft.PowerFx.Core.Syntax.SourceInformation; -using Microsoft.PowerFx.Core.Syntax.Visitors; using Microsoft.PowerFx.Core.Utils; +using Microsoft.PowerFx.Syntax; +using Microsoft.PowerFx.Syntax.SourceInformation; -namespace Microsoft.PowerFx.Core.Syntax.Nodes +namespace Microsoft.PowerFx.Syntax { /// /// Parent identifier parse node. diff --git a/src/libraries/Microsoft.PowerFx.Core/Syntax/Nodes/RecordNode.cs b/src/libraries/Microsoft.PowerFx.Core/Syntax/Nodes/RecordNode.cs index 5d3e26e9f0..c7193f3345 100644 --- a/src/libraries/Microsoft.PowerFx.Core/Syntax/Nodes/RecordNode.cs +++ b/src/libraries/Microsoft.PowerFx.Core/Syntax/Nodes/RecordNode.cs @@ -3,13 +3,12 @@ using System; using System.Collections.Generic; -using Microsoft.PowerFx.Core.Lexer.Tokens; using Microsoft.PowerFx.Core.Localization; -using Microsoft.PowerFx.Core.Syntax.SourceInformation; -using Microsoft.PowerFx.Core.Syntax.Visitors; using Microsoft.PowerFx.Core.Utils; +using Microsoft.PowerFx.Syntax; +using Microsoft.PowerFx.Syntax.SourceInformation; -namespace Microsoft.PowerFx.Core.Syntax.Nodes +namespace Microsoft.PowerFx.Syntax { /// /// Record expression parse node. diff --git a/src/libraries/Microsoft.PowerFx.Core/Syntax/Nodes/SelfNode.cs b/src/libraries/Microsoft.PowerFx.Core/Syntax/Nodes/SelfNode.cs index 0bd93831f3..942985bd15 100644 --- a/src/libraries/Microsoft.PowerFx.Core/Syntax/Nodes/SelfNode.cs +++ b/src/libraries/Microsoft.PowerFx.Core/Syntax/Nodes/SelfNode.cs @@ -1,13 +1,11 @@ // Copyright (c) Microsoft Corporation. // Licensed under the MIT license. -using Microsoft.PowerFx.Core.Lexer.Tokens; using Microsoft.PowerFx.Core.Localization; -using Microsoft.PowerFx.Core.Syntax.SourceInformation; -using Microsoft.PowerFx.Core.Syntax.Visitors; using Microsoft.PowerFx.Core.Utils; +using Microsoft.PowerFx.Syntax.SourceInformation; -namespace Microsoft.PowerFx.Core.Syntax.Nodes +namespace Microsoft.PowerFx.Syntax { /// /// Self identifier parse node. diff --git a/src/libraries/Microsoft.PowerFx.Core/Syntax/Nodes/StrInterpNode.cs b/src/libraries/Microsoft.PowerFx.Core/Syntax/Nodes/StrInterpNode.cs index bd89ce030d..9c71d3c53e 100644 --- a/src/libraries/Microsoft.PowerFx.Core/Syntax/Nodes/StrInterpNode.cs +++ b/src/libraries/Microsoft.PowerFx.Core/Syntax/Nodes/StrInterpNode.cs @@ -4,13 +4,12 @@ using System; using System.Collections.Generic; using System.Linq; -using Microsoft.PowerFx.Core.Lexer.Tokens; using Microsoft.PowerFx.Core.Localization; -using Microsoft.PowerFx.Core.Syntax.SourceInformation; -using Microsoft.PowerFx.Core.Syntax.Visitors; using Microsoft.PowerFx.Core.Utils; +using Microsoft.PowerFx.Syntax; +using Microsoft.PowerFx.Syntax.SourceInformation; -namespace Microsoft.PowerFx.Core.Syntax.Nodes +namespace Microsoft.PowerFx.Syntax { /// /// String interpolation parse node. diff --git a/src/libraries/Microsoft.PowerFx.Core/Syntax/Nodes/StrLitNode.cs b/src/libraries/Microsoft.PowerFx.Core/Syntax/Nodes/StrLitNode.cs index 2c6a057581..a1fe36be00 100644 --- a/src/libraries/Microsoft.PowerFx.Core/Syntax/Nodes/StrLitNode.cs +++ b/src/libraries/Microsoft.PowerFx.Core/Syntax/Nodes/StrLitNode.cs @@ -1,13 +1,11 @@ // Copyright (c) Microsoft Corporation. // Licensed under the MIT license. -using Microsoft.PowerFx.Core.Lexer.Tokens; using Microsoft.PowerFx.Core.Localization; -using Microsoft.PowerFx.Core.Syntax.SourceInformation; -using Microsoft.PowerFx.Core.Syntax.Visitors; using Microsoft.PowerFx.Core.Utils; +using Microsoft.PowerFx.Syntax.SourceInformation; -namespace Microsoft.PowerFx.Core.Syntax.Nodes +namespace Microsoft.PowerFx.Syntax { /// /// String literal parse node. Example: diff --git a/src/libraries/Microsoft.PowerFx.Core/Syntax/Nodes/TableNode.cs b/src/libraries/Microsoft.PowerFx.Core/Syntax/Nodes/TableNode.cs index 278f81921b..2adc819527 100644 --- a/src/libraries/Microsoft.PowerFx.Core/Syntax/Nodes/TableNode.cs +++ b/src/libraries/Microsoft.PowerFx.Core/Syntax/Nodes/TableNode.cs @@ -3,13 +3,12 @@ using System.Collections.Generic; using System.Linq; -using Microsoft.PowerFx.Core.Lexer.Tokens; using Microsoft.PowerFx.Core.Localization; -using Microsoft.PowerFx.Core.Syntax.SourceInformation; -using Microsoft.PowerFx.Core.Syntax.Visitors; using Microsoft.PowerFx.Core.Utils; +using Microsoft.PowerFx.Syntax; +using Microsoft.PowerFx.Syntax.SourceInformation; -namespace Microsoft.PowerFx.Core.Syntax.Nodes +namespace Microsoft.PowerFx.Syntax { /// /// Table expression parse node. Example: diff --git a/src/libraries/Microsoft.PowerFx.Core/Syntax/Nodes/TexlNode.cs b/src/libraries/Microsoft.PowerFx.Core/Syntax/Nodes/TexlNode.cs index 5e17762371..27cfb6cc11 100644 --- a/src/libraries/Microsoft.PowerFx.Core/Syntax/Nodes/TexlNode.cs +++ b/src/libraries/Microsoft.PowerFx.Core/Syntax/Nodes/TexlNode.cs @@ -2,13 +2,11 @@ // Licensed under the MIT license. using System.Linq; -using Microsoft.PowerFx.Core.Lexer.Tokens; using Microsoft.PowerFx.Core.Localization; -using Microsoft.PowerFx.Core.Syntax.SourceInformation; -using Microsoft.PowerFx.Core.Syntax.Visitors; using Microsoft.PowerFx.Core.Utils; +using Microsoft.PowerFx.Syntax.SourceInformation; -namespace Microsoft.PowerFx.Core.Syntax.Nodes +namespace Microsoft.PowerFx.Syntax { /// /// Base class for all parse nodes. diff --git a/src/libraries/Microsoft.PowerFx.Core/Syntax/Nodes/UnaryOpNode.cs b/src/libraries/Microsoft.PowerFx.Core/Syntax/Nodes/UnaryOpNode.cs index 1baa3672c7..50af6e70db 100644 --- a/src/libraries/Microsoft.PowerFx.Core/Syntax/Nodes/UnaryOpNode.cs +++ b/src/libraries/Microsoft.PowerFx.Core/Syntax/Nodes/UnaryOpNode.cs @@ -3,14 +3,12 @@ using System; using System.Collections.Generic; -using Microsoft.PowerFx.Core.Lexer; -using Microsoft.PowerFx.Core.Lexer.Tokens; using Microsoft.PowerFx.Core.Localization; -using Microsoft.PowerFx.Core.Syntax.SourceInformation; -using Microsoft.PowerFx.Core.Syntax.Visitors; using Microsoft.PowerFx.Core.Utils; +using Microsoft.PowerFx.Syntax; +using Microsoft.PowerFx.Syntax.SourceInformation; -namespace Microsoft.PowerFx.Core.Syntax.Nodes +namespace Microsoft.PowerFx.Syntax { /// /// Unary operation parse node. Examples: diff --git a/src/libraries/Microsoft.PowerFx.Core/Syntax/Nodes/VariadicBase.cs b/src/libraries/Microsoft.PowerFx.Core/Syntax/Nodes/VariadicBase.cs index 52ec855360..5e0713a724 100644 --- a/src/libraries/Microsoft.PowerFx.Core/Syntax/Nodes/VariadicBase.cs +++ b/src/libraries/Microsoft.PowerFx.Core/Syntax/Nodes/VariadicBase.cs @@ -3,13 +3,12 @@ using System.Collections.Generic; using System.Linq; -using Microsoft.PowerFx.Core.Lexer.Tokens; using Microsoft.PowerFx.Core.Localization; -using Microsoft.PowerFx.Core.Syntax.SourceInformation; -using Microsoft.PowerFx.Core.Syntax.Visitors; using Microsoft.PowerFx.Core.Utils; +using Microsoft.PowerFx.Syntax; +using Microsoft.PowerFx.Syntax.SourceInformation; -namespace Microsoft.PowerFx.Core.Syntax.Nodes +namespace Microsoft.PowerFx.Syntax { /// /// Base class for all variadic (i.e., with variable number of children) parse nodes. diff --git a/src/libraries/Microsoft.PowerFx.Core/Syntax/Nodes/VariadicOpNode.cs b/src/libraries/Microsoft.PowerFx.Core/Syntax/Nodes/VariadicOpNode.cs index 9c1573a592..3065875cfb 100644 --- a/src/libraries/Microsoft.PowerFx.Core/Syntax/Nodes/VariadicOpNode.cs +++ b/src/libraries/Microsoft.PowerFx.Core/Syntax/Nodes/VariadicOpNode.cs @@ -3,14 +3,12 @@ using System.Collections.Generic; using System.Linq; -using Microsoft.PowerFx.Core.Lexer; -using Microsoft.PowerFx.Core.Lexer.Tokens; using Microsoft.PowerFx.Core.Localization; -using Microsoft.PowerFx.Core.Syntax.SourceInformation; -using Microsoft.PowerFx.Core.Syntax.Visitors; using Microsoft.PowerFx.Core.Utils; +using Microsoft.PowerFx.Syntax; +using Microsoft.PowerFx.Syntax.SourceInformation; -namespace Microsoft.PowerFx.Core.Syntax.Nodes +namespace Microsoft.PowerFx.Syntax { /// /// Variadic operation node. Example: diff --git a/src/libraries/Microsoft.PowerFx.Core/Syntax/Precedence.cs b/src/libraries/Microsoft.PowerFx.Core/Syntax/Precedence.cs index 39be970cb2..55222281c1 100644 --- a/src/libraries/Microsoft.PowerFx.Core/Syntax/Precedence.cs +++ b/src/libraries/Microsoft.PowerFx.Core/Syntax/Precedence.cs @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. // Licensed under the MIT license. -namespace Microsoft.PowerFx.Core.Syntax +namespace Microsoft.PowerFx.Syntax { // Operator precedence. internal enum Precedence : byte diff --git a/src/libraries/Microsoft.PowerFx.Core/Syntax/SourceInformation/ITexlSource.cs b/src/libraries/Microsoft.PowerFx.Core/Syntax/SourceInformation/ITexlSource.cs index 9d3adc7a25..7217380cdb 100644 --- a/src/libraries/Microsoft.PowerFx.Core/Syntax/SourceInformation/ITexlSource.cs +++ b/src/libraries/Microsoft.PowerFx.Core/Syntax/SourceInformation/ITexlSource.cs @@ -2,11 +2,10 @@ // Licensed under the MIT license. using System.Collections.Generic; -using Microsoft.PowerFx.Core.Lexer.Tokens; using Microsoft.PowerFx.Core.Localization; -using Microsoft.PowerFx.Core.Syntax.Nodes; +using Microsoft.PowerFx.Syntax; -namespace Microsoft.PowerFx.Core.Syntax.SourceInformation +namespace Microsoft.PowerFx.Syntax.SourceInformation { /// /// An individual piece of the source that should be associated with a given diff --git a/src/libraries/Microsoft.PowerFx.Core/Syntax/SourceInformation/IdentifierSource.cs b/src/libraries/Microsoft.PowerFx.Core/Syntax/SourceInformation/IdentifierSource.cs index 93974dd32d..9c8855f008 100644 --- a/src/libraries/Microsoft.PowerFx.Core/Syntax/SourceInformation/IdentifierSource.cs +++ b/src/libraries/Microsoft.PowerFx.Core/Syntax/SourceInformation/IdentifierSource.cs @@ -2,12 +2,11 @@ // Licensed under the MIT license. using System.Collections.Generic; -using Microsoft.PowerFx.Core.Lexer.Tokens; using Microsoft.PowerFx.Core.Localization; -using Microsoft.PowerFx.Core.Syntax.Nodes; using Microsoft.PowerFx.Core.Utils; +using Microsoft.PowerFx.Syntax; -namespace Microsoft.PowerFx.Core.Syntax.SourceInformation +namespace Microsoft.PowerFx.Syntax.SourceInformation { internal class IdentifierSource : ITexlSource { diff --git a/src/libraries/Microsoft.PowerFx.Core/Syntax/SourceInformation/NodeSource.cs b/src/libraries/Microsoft.PowerFx.Core/Syntax/SourceInformation/NodeSource.cs index f14b20d729..9d37ae52fd 100644 --- a/src/libraries/Microsoft.PowerFx.Core/Syntax/SourceInformation/NodeSource.cs +++ b/src/libraries/Microsoft.PowerFx.Core/Syntax/SourceInformation/NodeSource.cs @@ -2,12 +2,11 @@ // Licensed under the MIT license. using System.Collections.Generic; -using Microsoft.PowerFx.Core.Lexer.Tokens; using Microsoft.PowerFx.Core.Localization; -using Microsoft.PowerFx.Core.Syntax.Nodes; using Microsoft.PowerFx.Core.Utils; +using Microsoft.PowerFx.Syntax; -namespace Microsoft.PowerFx.Core.Syntax.SourceInformation +namespace Microsoft.PowerFx.Syntax.SourceInformation { /// /// A recursive reference to another node as a piece of the source for diff --git a/src/libraries/Microsoft.PowerFx.Core/Syntax/SourceInformation/SourceList.cs b/src/libraries/Microsoft.PowerFx.Core/Syntax/SourceInformation/SourceList.cs index b49499d324..d06198ea29 100644 --- a/src/libraries/Microsoft.PowerFx.Core/Syntax/SourceInformation/SourceList.cs +++ b/src/libraries/Microsoft.PowerFx.Core/Syntax/SourceInformation/SourceList.cs @@ -3,12 +3,11 @@ using System.Collections.Generic; using System.Linq; -using Microsoft.PowerFx.Core.Lexer.Tokens; using Microsoft.PowerFx.Core.Localization; -using Microsoft.PowerFx.Core.Syntax.Nodes; using Microsoft.PowerFx.Core.Utils; +using Microsoft.PowerFx.Syntax; -namespace Microsoft.PowerFx.Core.Syntax.SourceInformation +namespace Microsoft.PowerFx.Syntax.SourceInformation { /// /// A complete list of the source for a given TexlNode, given by a diff --git a/src/libraries/Microsoft.PowerFx.Core/Syntax/SourceInformation/SpreadSource.cs b/src/libraries/Microsoft.PowerFx.Core/Syntax/SourceInformation/SpreadSource.cs index 525a7bd06e..5b83463cf4 100644 --- a/src/libraries/Microsoft.PowerFx.Core/Syntax/SourceInformation/SpreadSource.cs +++ b/src/libraries/Microsoft.PowerFx.Core/Syntax/SourceInformation/SpreadSource.cs @@ -3,12 +3,11 @@ using System.Collections.Generic; using System.Linq; -using Microsoft.PowerFx.Core.Lexer.Tokens; using Microsoft.PowerFx.Core.Localization; -using Microsoft.PowerFx.Core.Syntax.Nodes; using Microsoft.PowerFx.Core.Utils; +using Microsoft.PowerFx.Syntax; -namespace Microsoft.PowerFx.Core.Syntax.SourceInformation +namespace Microsoft.PowerFx.Syntax.SourceInformation { /// /// A utility class for spreading a list of sources within a SourceList. diff --git a/src/libraries/Microsoft.PowerFx.Core/Syntax/SourceInformation/TokenSource.cs b/src/libraries/Microsoft.PowerFx.Core/Syntax/SourceInformation/TokenSource.cs index 9762d960e8..b35edcdf2b 100644 --- a/src/libraries/Microsoft.PowerFx.Core/Syntax/SourceInformation/TokenSource.cs +++ b/src/libraries/Microsoft.PowerFx.Core/Syntax/SourceInformation/TokenSource.cs @@ -3,13 +3,11 @@ using System; using System.Collections.Generic; -using Microsoft.PowerFx.Core.Lexer; -using Microsoft.PowerFx.Core.Lexer.Tokens; using Microsoft.PowerFx.Core.Localization; -using Microsoft.PowerFx.Core.Syntax.Nodes; using Microsoft.PowerFx.Core.Utils; +using Microsoft.PowerFx.Syntax; -namespace Microsoft.PowerFx.Core.Syntax.SourceInformation +namespace Microsoft.PowerFx.Syntax.SourceInformation { /// /// An individual non-whitespace token that is part of the source for its diff --git a/src/libraries/Microsoft.PowerFx.Core/Syntax/SourceInformation/WhitespaceSource.cs b/src/libraries/Microsoft.PowerFx.Core/Syntax/SourceInformation/WhitespaceSource.cs index f1888c1214..662094bd98 100644 --- a/src/libraries/Microsoft.PowerFx.Core/Syntax/SourceInformation/WhitespaceSource.cs +++ b/src/libraries/Microsoft.PowerFx.Core/Syntax/SourceInformation/WhitespaceSource.cs @@ -3,12 +3,11 @@ using System.Collections.Generic; using System.Linq; -using Microsoft.PowerFx.Core.Lexer.Tokens; using Microsoft.PowerFx.Core.Localization; -using Microsoft.PowerFx.Core.Syntax.Nodes; using Microsoft.PowerFx.Core.Utils; +using Microsoft.PowerFx.Syntax; -namespace Microsoft.PowerFx.Core.Syntax.SourceInformation +namespace Microsoft.PowerFx.Syntax.SourceInformation { /// /// A series of whitespace tokens that are part of the source for the diff --git a/src/libraries/Microsoft.PowerFx.Core/Syntax/TexlPretty.cs b/src/libraries/Microsoft.PowerFx.Core/Syntax/TexlPretty.cs index 47c9ceeec4..99db65a3d0 100644 --- a/src/libraries/Microsoft.PowerFx.Core/Syntax/TexlPretty.cs +++ b/src/libraries/Microsoft.PowerFx.Core/Syntax/TexlPretty.cs @@ -6,16 +6,13 @@ using System.Linq; using System.Text; using System.Text.RegularExpressions; -using Microsoft.PowerFx.Core.Lexer; -using Microsoft.PowerFx.Core.Lexer.Tokens; using Microsoft.PowerFx.Core.Parser; -using Microsoft.PowerFx.Core.Syntax.Nodes; -using Microsoft.PowerFx.Core.Syntax.SourceInformation; -using Microsoft.PowerFx.Core.Syntax.Visitors; using Microsoft.PowerFx.Core.UtilityDataStructures; using Microsoft.PowerFx.Core.Utils; +using Microsoft.PowerFx.Syntax; +using Microsoft.PowerFx.Syntax.SourceInformation; -namespace Microsoft.PowerFx.Core.Syntax +namespace Microsoft.PowerFx.Syntax { // Simple pretty-printing visitor (Task #2489649 // Todo: currently being used by node.ToString(). Need to figure diff --git a/src/libraries/Microsoft.PowerFx.Core/Syntax/Visitors/AggregateVisitor.cs b/src/libraries/Microsoft.PowerFx.Core/Syntax/Visitors/AggregateVisitor.cs index 156fe1499a..77b116095d 100644 --- a/src/libraries/Microsoft.PowerFx.Core/Syntax/Visitors/AggregateVisitor.cs +++ b/src/libraries/Microsoft.PowerFx.Core/Syntax/Visitors/AggregateVisitor.cs @@ -4,9 +4,8 @@ using System; using System.Collections.Generic; using System.Linq; -using Microsoft.PowerFx.Core.Syntax.Nodes; -namespace Microsoft.PowerFx.Core.Syntax.Visitors +namespace Microsoft.PowerFx.Syntax { /// /// A base visitor for returning results that can be easily aggregated (lists, booleans, sums). diff --git a/src/libraries/Microsoft.PowerFx.Core/Syntax/Visitors/ChainTrackerVisitor.cs b/src/libraries/Microsoft.PowerFx.Core/Syntax/Visitors/ChainTrackerVisitor.cs index a03b2ae816..0e4156f3b1 100644 --- a/src/libraries/Microsoft.PowerFx.Core/Syntax/Visitors/ChainTrackerVisitor.cs +++ b/src/libraries/Microsoft.PowerFx.Core/Syntax/Visitors/ChainTrackerVisitor.cs @@ -1,10 +1,7 @@ // Copyright (c) Microsoft Corporation. // Licensed under the MIT license. -using Microsoft.PowerFx.Core.Lexer; -using Microsoft.PowerFx.Core.Syntax.Nodes; - -namespace Microsoft.PowerFx.Core.Syntax.Visitors +namespace Microsoft.PowerFx.Syntax { internal sealed class ChainTrackerVisitor : IdentityTexlVisitor { @@ -33,4 +30,4 @@ public override bool PreVisit(VariadicOpNode node) return true; } } -} \ No newline at end of file +} diff --git a/src/libraries/Microsoft.PowerFx.Core/Syntax/Visitors/DefaultVisitor.cs b/src/libraries/Microsoft.PowerFx.Core/Syntax/Visitors/DefaultVisitor.cs index ab42536dfd..1e05dd0436 100644 --- a/src/libraries/Microsoft.PowerFx.Core/Syntax/Visitors/DefaultVisitor.cs +++ b/src/libraries/Microsoft.PowerFx.Core/Syntax/Visitors/DefaultVisitor.cs @@ -1,9 +1,7 @@ // Copyright (c) Microsoft Corporation. // Licensed under the MIT license. -using Microsoft.PowerFx.Core.Syntax.Nodes; - -namespace Microsoft.PowerFx.Core.Syntax.Visitors +namespace Microsoft.PowerFx.Syntax { /// /// A base visitor for when you want a default result for most nodes. diff --git a/src/libraries/Microsoft.PowerFx.Core/Syntax/Visitors/FindNodeVisitor.cs b/src/libraries/Microsoft.PowerFx.Core/Syntax/Visitors/FindNodeVisitor.cs index fcccef1c1a..b179c3cc0e 100644 --- a/src/libraries/Microsoft.PowerFx.Core/Syntax/Visitors/FindNodeVisitor.cs +++ b/src/libraries/Microsoft.PowerFx.Core/Syntax/Visitors/FindNodeVisitor.cs @@ -2,12 +2,9 @@ // Licensed under the MIT license. using System.Linq; -using Microsoft.PowerFx.Core.Lexer; -using Microsoft.PowerFx.Core.Lexer.Tokens; -using Microsoft.PowerFx.Core.Syntax.Nodes; using Microsoft.PowerFx.Core.Utils; -namespace Microsoft.PowerFx.Core.Syntax.Visitors +namespace Microsoft.PowerFx.Syntax { internal sealed class FindNodeVisitor : IdentityTexlVisitor { diff --git a/src/libraries/Microsoft.PowerFx.Core/Syntax/Visitors/IdentityTexlVisitor.cs b/src/libraries/Microsoft.PowerFx.Core/Syntax/Visitors/IdentityTexlVisitor.cs index cf01e0d263..bd326eeef8 100644 --- a/src/libraries/Microsoft.PowerFx.Core/Syntax/Visitors/IdentityTexlVisitor.cs +++ b/src/libraries/Microsoft.PowerFx.Core/Syntax/Visitors/IdentityTexlVisitor.cs @@ -1,9 +1,7 @@ // Copyright (c) Microsoft Corporation. // Licensed under the MIT license. -using Microsoft.PowerFx.Core.Syntax.Nodes; - -namespace Microsoft.PowerFx.Core.Syntax.Visitors +namespace Microsoft.PowerFx.Syntax { /// /// Visitor that by default does nothing. . diff --git a/src/libraries/Microsoft.PowerFx.Core/Syntax/Visitors/TexlFunctionalVisitor.cs b/src/libraries/Microsoft.PowerFx.Core/Syntax/Visitors/TexlFunctionalVisitor.cs index c8c326d540..cddf27a652 100644 --- a/src/libraries/Microsoft.PowerFx.Core/Syntax/Visitors/TexlFunctionalVisitor.cs +++ b/src/libraries/Microsoft.PowerFx.Core/Syntax/Visitors/TexlFunctionalVisitor.cs @@ -1,9 +1,7 @@ // Copyright (c) Microsoft Corporation. // Licensed under the MIT license. -using Microsoft.PowerFx.Core.Syntax.Nodes; - -namespace Microsoft.PowerFx.Core.Syntax.Visitors +namespace Microsoft.PowerFx.Syntax { /// /// A visitor that passes a context to each visit method and where each visit method returns a result. diff --git a/src/libraries/Microsoft.PowerFx.Core/Syntax/Visitors/TexlVisitor.cs b/src/libraries/Microsoft.PowerFx.Core/Syntax/Visitors/TexlVisitor.cs index 7342dddb68..c507a40ef7 100644 --- a/src/libraries/Microsoft.PowerFx.Core/Syntax/Visitors/TexlVisitor.cs +++ b/src/libraries/Microsoft.PowerFx.Core/Syntax/Visitors/TexlVisitor.cs @@ -1,9 +1,7 @@ // Copyright (c) Microsoft Corporation. // Licensed under the MIT license. -using Microsoft.PowerFx.Core.Syntax.Nodes; - -namespace Microsoft.PowerFx.Core.Syntax.Visitors +namespace Microsoft.PowerFx.Syntax { /// /// Abstract visitor base class. diff --git a/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/AddColumns.cs b/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/AddColumns.cs index 473c665a40..4f4f08b6af 100644 --- a/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/AddColumns.cs +++ b/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/AddColumns.cs @@ -8,9 +8,9 @@ using Microsoft.PowerFx.Core.Errors; using Microsoft.PowerFx.Core.Functions; using Microsoft.PowerFx.Core.Localization; -using Microsoft.PowerFx.Core.Syntax.Nodes; using Microsoft.PowerFx.Core.Types; using Microsoft.PowerFx.Core.Utils; +using Microsoft.PowerFx.Syntax; namespace Microsoft.PowerFx.Core.Texl.Builtins { diff --git a/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/AsType.cs b/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/AsType.cs index 773874d3ff..2e737fa2aa 100644 --- a/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/AsType.cs +++ b/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/AsType.cs @@ -10,9 +10,9 @@ using Microsoft.PowerFx.Core.Functions; using Microsoft.PowerFx.Core.Functions.Delegation; using Microsoft.PowerFx.Core.Localization; -using Microsoft.PowerFx.Core.Syntax.Nodes; using Microsoft.PowerFx.Core.Types; using Microsoft.PowerFx.Core.Utils; +using Microsoft.PowerFx.Syntax; namespace Microsoft.PowerFx.Core.Texl.Builtins { diff --git a/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/Char.cs b/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/Char.cs index f4350581ae..1b3a1eeb83 100644 --- a/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/Char.cs +++ b/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/Char.cs @@ -6,9 +6,9 @@ using Microsoft.PowerFx.Core.Binding; using Microsoft.PowerFx.Core.Functions; using Microsoft.PowerFx.Core.Localization; -using Microsoft.PowerFx.Core.Syntax.Nodes; using Microsoft.PowerFx.Core.Types; using Microsoft.PowerFx.Core.Utils; +using Microsoft.PowerFx.Syntax; namespace Microsoft.PowerFx.Core.Texl.Builtins { diff --git a/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/Coalesce.cs b/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/Coalesce.cs index fbc9d089c2..887fb07127 100644 --- a/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/Coalesce.cs +++ b/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/Coalesce.cs @@ -7,9 +7,9 @@ using Microsoft.PowerFx.Core.Errors; using Microsoft.PowerFx.Core.Functions; using Microsoft.PowerFx.Core.Localization; -using Microsoft.PowerFx.Core.Syntax.Nodes; using Microsoft.PowerFx.Core.Types; using Microsoft.PowerFx.Core.Utils; +using Microsoft.PowerFx.Syntax; namespace Microsoft.PowerFx.Core.Texl.Builtins { diff --git a/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/ColorFadeT.cs b/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/ColorFadeT.cs index 0fdea184d1..6a9e855f05 100644 --- a/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/ColorFadeT.cs +++ b/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/ColorFadeT.cs @@ -7,10 +7,10 @@ using Microsoft.PowerFx.Core.Errors; using Microsoft.PowerFx.Core.Functions; using Microsoft.PowerFx.Core.Localization; -using Microsoft.PowerFx.Core.Syntax.Nodes; using Microsoft.PowerFx.Core.Types; using Microsoft.PowerFx.Core.Types.Enums; using Microsoft.PowerFx.Core.Utils; +using Microsoft.PowerFx.Syntax; namespace Microsoft.PowerFx.Core.Texl.Builtins { diff --git a/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/Concatenate.cs b/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/Concatenate.cs index 5dfad6f6cb..537ecc0c26 100644 --- a/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/Concatenate.cs +++ b/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/Concatenate.cs @@ -6,9 +6,9 @@ using Microsoft.PowerFx.Core.Binding; using Microsoft.PowerFx.Core.Functions; using Microsoft.PowerFx.Core.Localization; -using Microsoft.PowerFx.Core.Syntax.Nodes; using Microsoft.PowerFx.Core.Types; using Microsoft.PowerFx.Core.Utils; +using Microsoft.PowerFx.Syntax; namespace Microsoft.PowerFx.Core.Texl.Builtins { diff --git a/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/Count.cs b/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/Count.cs index 5fc04ccb45..00e699e21f 100644 --- a/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/Count.cs +++ b/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/Count.cs @@ -7,9 +7,9 @@ using Microsoft.PowerFx.Core.Binding; using Microsoft.PowerFx.Core.Errors; using Microsoft.PowerFx.Core.Localization; -using Microsoft.PowerFx.Core.Syntax.Nodes; using Microsoft.PowerFx.Core.Types; using Microsoft.PowerFx.Core.Utils; +using Microsoft.PowerFx.Syntax; namespace Microsoft.PowerFx.Core.Texl.Builtins { diff --git a/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/CountA.cs b/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/CountA.cs index e540e94eff..f22be913d2 100644 --- a/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/CountA.cs +++ b/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/CountA.cs @@ -7,9 +7,9 @@ using Microsoft.PowerFx.Core.Binding; using Microsoft.PowerFx.Core.Errors; using Microsoft.PowerFx.Core.Localization; -using Microsoft.PowerFx.Core.Syntax.Nodes; using Microsoft.PowerFx.Core.Types; using Microsoft.PowerFx.Core.Utils; +using Microsoft.PowerFx.Syntax; namespace Microsoft.PowerFx.Core.Texl.Builtins { diff --git a/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/CountIf.cs b/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/CountIf.cs index 5541f52423..8155a653c3 100644 --- a/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/CountIf.cs +++ b/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/CountIf.cs @@ -10,9 +10,9 @@ using Microsoft.PowerFx.Core.Functions.Delegation; using Microsoft.PowerFx.Core.Functions.Delegation.DelegationMetadata; using Microsoft.PowerFx.Core.Localization; -using Microsoft.PowerFx.Core.Syntax.Nodes; using Microsoft.PowerFx.Core.Types; using Microsoft.PowerFx.Core.Utils; +using Microsoft.PowerFx.Syntax; namespace Microsoft.PowerFx.Core.Texl.Builtins { diff --git a/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/CountRows.cs b/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/CountRows.cs index 0cf2b67726..8283cc36a7 100644 --- a/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/CountRows.cs +++ b/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/CountRows.cs @@ -8,9 +8,9 @@ using Microsoft.PowerFx.Core.Functions; using Microsoft.PowerFx.Core.Functions.Delegation; using Microsoft.PowerFx.Core.Localization; -using Microsoft.PowerFx.Core.Syntax.Nodes; using Microsoft.PowerFx.Core.Types; using Microsoft.PowerFx.Core.Utils; +using Microsoft.PowerFx.Syntax; namespace Microsoft.PowerFx.Core.Texl.Builtins { diff --git a/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/DateTime.cs b/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/DateTime.cs index d9d544aaa1..d918b0e030 100644 --- a/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/DateTime.cs +++ b/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/DateTime.cs @@ -9,10 +9,10 @@ using Microsoft.PowerFx.Core.Functions; using Microsoft.PowerFx.Core.Functions.Delegation; using Microsoft.PowerFx.Core.Localization; -using Microsoft.PowerFx.Core.Syntax.Nodes; using Microsoft.PowerFx.Core.Types; using Microsoft.PowerFx.Core.Types.Enums; using Microsoft.PowerFx.Core.Utils; +using Microsoft.PowerFx.Syntax; #pragma warning disable SA1402 // File may only contain a single type #pragma warning disable SA1649 // File name should match first type name diff --git a/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/DropColumns.cs b/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/DropColumns.cs index 865ceda60a..7898c47973 100644 --- a/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/DropColumns.cs +++ b/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/DropColumns.cs @@ -6,9 +6,9 @@ using Microsoft.PowerFx.Core.Binding; using Microsoft.PowerFx.Core.Errors; using Microsoft.PowerFx.Core.Localization; -using Microsoft.PowerFx.Core.Syntax.Nodes; using Microsoft.PowerFx.Core.Types; using Microsoft.PowerFx.Core.Utils; +using Microsoft.PowerFx.Syntax; namespace Microsoft.PowerFx.Core.Texl.Builtins { diff --git a/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/EndsWith.cs b/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/EndsWith.cs index 20eea7f4b7..bea30c2ce5 100644 --- a/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/EndsWith.cs +++ b/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/EndsWith.cs @@ -5,8 +5,8 @@ using Microsoft.PowerFx.Core.Binding; using Microsoft.PowerFx.Core.Functions.Delegation; using Microsoft.PowerFx.Core.Localization; -using Microsoft.PowerFx.Core.Syntax.Nodes; using Microsoft.PowerFx.Core.Utils; +using Microsoft.PowerFx.Syntax; namespace Microsoft.PowerFx.Core.Texl.Builtins { @@ -38,4 +38,4 @@ public override bool IsRowScopedServerDelegatable(CallNode callNode, TexlBinding // TASK: 856362 // Add overload for single-column table as the input for both endsWith and startsWith. } -} \ No newline at end of file +} diff --git a/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/Error.cs b/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/Error.cs index 944a186cb1..0dc116e92f 100644 --- a/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/Error.cs +++ b/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/Error.cs @@ -7,10 +7,10 @@ using Microsoft.PowerFx.Core.Errors; using Microsoft.PowerFx.Core.Functions; using Microsoft.PowerFx.Core.Localization; -using Microsoft.PowerFx.Core.Syntax.Nodes; using Microsoft.PowerFx.Core.Types; using Microsoft.PowerFx.Core.Types.Enums; using Microsoft.PowerFx.Core.Utils; +using Microsoft.PowerFx.Syntax; namespace Microsoft.PowerFx.Core.Texl.Builtins { diff --git a/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/Filter.cs b/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/Filter.cs index 35cacbca38..f76c8eadd2 100644 --- a/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/Filter.cs +++ b/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/Filter.cs @@ -10,9 +10,9 @@ using Microsoft.PowerFx.Core.Functions.Delegation; using Microsoft.PowerFx.Core.Functions.Delegation.DelegationMetadata; using Microsoft.PowerFx.Core.Localization; -using Microsoft.PowerFx.Core.Syntax.Nodes; using Microsoft.PowerFx.Core.Types; using Microsoft.PowerFx.Core.Utils; +using Microsoft.PowerFx.Syntax; namespace Microsoft.PowerFx.Core.Texl.Builtins { diff --git a/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/FilterDelegationBase.cs b/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/FilterDelegationBase.cs index 27a9fa300d..3fc722cb11 100644 --- a/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/FilterDelegationBase.cs +++ b/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/FilterDelegationBase.cs @@ -6,10 +6,9 @@ using Microsoft.PowerFx.Core.Functions.Delegation; using Microsoft.PowerFx.Core.Functions.Delegation.DelegationMetadata; using Microsoft.PowerFx.Core.Localization; -using Microsoft.PowerFx.Core.Syntax; -using Microsoft.PowerFx.Core.Syntax.Nodes; using Microsoft.PowerFx.Core.Types; using Microsoft.PowerFx.Core.Utils; +using Microsoft.PowerFx.Syntax; namespace Microsoft.PowerFx.Core.Texl.Builtins { diff --git a/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/Find.cs b/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/Find.cs index 1058225b51..1eb217869b 100644 --- a/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/Find.cs +++ b/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/Find.cs @@ -7,9 +7,9 @@ using Microsoft.PowerFx.Core.Errors; using Microsoft.PowerFx.Core.Functions; using Microsoft.PowerFx.Core.Localization; -using Microsoft.PowerFx.Core.Syntax.Nodes; using Microsoft.PowerFx.Core.Types; using Microsoft.PowerFx.Core.Utils; +using Microsoft.PowerFx.Syntax; namespace Microsoft.PowerFx.Core.Texl.Builtins { diff --git a/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/FirstLast.cs b/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/FirstLast.cs index 9870461a7e..78131abcab 100644 --- a/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/FirstLast.cs +++ b/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/FirstLast.cs @@ -8,9 +8,9 @@ using Microsoft.PowerFx.Core.Errors; using Microsoft.PowerFx.Core.Functions.Delegation; using Microsoft.PowerFx.Core.Localization; -using Microsoft.PowerFx.Core.Syntax.Nodes; using Microsoft.PowerFx.Core.Types; using Microsoft.PowerFx.Core.Utils; +using Microsoft.PowerFx.Syntax; namespace Microsoft.PowerFx.Core.Texl.Builtins { diff --git a/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/FirstLastN.cs b/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/FirstLastN.cs index 7dc53a089c..1ac62c843d 100644 --- a/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/FirstLastN.cs +++ b/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/FirstLastN.cs @@ -5,9 +5,9 @@ using Microsoft.PowerFx.Core.App.ErrorContainers; using Microsoft.PowerFx.Core.Binding; using Microsoft.PowerFx.Core.Localization; -using Microsoft.PowerFx.Core.Syntax.Nodes; using Microsoft.PowerFx.Core.Types; using Microsoft.PowerFx.Core.Utils; +using Microsoft.PowerFx.Syntax; #pragma warning disable SA1649 // File name should match first type name diff --git a/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/ForAll.cs b/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/ForAll.cs index ee09bf59ba..e7a6735f8e 100644 --- a/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/ForAll.cs +++ b/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/ForAll.cs @@ -6,9 +6,9 @@ using Microsoft.PowerFx.Core.Binding; using Microsoft.PowerFx.Core.Functions; using Microsoft.PowerFx.Core.Localization; -using Microsoft.PowerFx.Core.Syntax.Nodes; using Microsoft.PowerFx.Core.Types; using Microsoft.PowerFx.Core.Utils; +using Microsoft.PowerFx.Syntax; namespace Microsoft.PowerFx.Core.Texl.Builtins { @@ -73,4 +73,4 @@ public override string GetUniqueTexlRuntimeName(bool isPrefetching = false) return GetUniqueTexlRuntimeName(suffix: isPrefetching ? "_ParallelPrefetching" : string.Empty); } } -} \ No newline at end of file +} diff --git a/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/If.cs b/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/If.cs index d7173672d4..e88382f494 100644 --- a/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/If.cs +++ b/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/If.cs @@ -9,11 +9,10 @@ using Microsoft.PowerFx.Core.Errors; using Microsoft.PowerFx.Core.Functions; using Microsoft.PowerFx.Core.Functions.FunctionArgValidators; -using Microsoft.PowerFx.Core.Lexer; using Microsoft.PowerFx.Core.Localization; -using Microsoft.PowerFx.Core.Syntax.Nodes; using Microsoft.PowerFx.Core.Types; using Microsoft.PowerFx.Core.Utils; +using Microsoft.PowerFx.Syntax; namespace Microsoft.PowerFx.Core.Texl.Builtins { diff --git a/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/IfError.cs b/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/IfError.cs index 2b54a2fc66..365a37129d 100644 --- a/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/IfError.cs +++ b/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/IfError.cs @@ -6,11 +6,10 @@ using Microsoft.PowerFx.Core.Binding; using Microsoft.PowerFx.Core.Errors; using Microsoft.PowerFx.Core.Functions; -using Microsoft.PowerFx.Core.Lexer; using Microsoft.PowerFx.Core.Localization; -using Microsoft.PowerFx.Core.Syntax.Nodes; using Microsoft.PowerFx.Core.Types; using Microsoft.PowerFx.Core.Utils; +using Microsoft.PowerFx.Syntax; namespace Microsoft.PowerFx.Core.Texl.Builtins { diff --git a/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/Index.cs b/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/Index.cs index b7918dbf30..33770c5bd1 100644 --- a/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/Index.cs +++ b/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/Index.cs @@ -5,9 +5,9 @@ using Microsoft.PowerFx.Core.App.ErrorContainers; using Microsoft.PowerFx.Core.Binding; using Microsoft.PowerFx.Core.Localization; -using Microsoft.PowerFx.Core.Syntax.Nodes; using Microsoft.PowerFx.Core.Types; using Microsoft.PowerFx.Core.Utils; +using Microsoft.PowerFx.Syntax; namespace Microsoft.PowerFx.Core.Texl.Builtins { diff --git a/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/IsBlank.cs b/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/IsBlank.cs index 7b60f962bf..b410286a54 100644 --- a/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/IsBlank.cs +++ b/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/IsBlank.cs @@ -7,11 +7,10 @@ using Microsoft.PowerFx.Core.Binding; using Microsoft.PowerFx.Core.Functions; using Microsoft.PowerFx.Core.Functions.Delegation; -using Microsoft.PowerFx.Core.Lexer; using Microsoft.PowerFx.Core.Localization; -using Microsoft.PowerFx.Core.Syntax.Nodes; using Microsoft.PowerFx.Core.Types; using Microsoft.PowerFx.Core.Utils; +using Microsoft.PowerFx.Syntax; namespace Microsoft.PowerFx.Core.Texl.Builtins { diff --git a/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/IsError.cs b/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/IsError.cs index 6f7f2c229f..080faeefb5 100644 --- a/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/IsError.cs +++ b/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/IsError.cs @@ -6,9 +6,9 @@ using Microsoft.PowerFx.Core.Binding; using Microsoft.PowerFx.Core.Functions; using Microsoft.PowerFx.Core.Localization; -using Microsoft.PowerFx.Core.Syntax.Nodes; using Microsoft.PowerFx.Core.Types; using Microsoft.PowerFx.Core.Utils; +using Microsoft.PowerFx.Syntax; namespace Microsoft.PowerFx.Core.Texl.Builtins { diff --git a/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/IsToday.cs b/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/IsToday.cs index 96a47603b2..ddda27cc73 100644 --- a/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/IsToday.cs +++ b/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/IsToday.cs @@ -7,9 +7,9 @@ using Microsoft.PowerFx.Core.Errors; using Microsoft.PowerFx.Core.Functions; using Microsoft.PowerFx.Core.Localization; -using Microsoft.PowerFx.Core.Syntax.Nodes; using Microsoft.PowerFx.Core.Types; using Microsoft.PowerFx.Core.Utils; +using Microsoft.PowerFx.Syntax; namespace Microsoft.PowerFx.Core.Texl.Builtins { @@ -58,4 +58,4 @@ public override bool CheckInvocation(TexlBinding binding, TexlNode[] args, DType return fValid; } } -} \ No newline at end of file +} diff --git a/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/IsUTCToday.cs b/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/IsUTCToday.cs index 49c1655f9a..79d3121f2f 100644 --- a/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/IsUTCToday.cs +++ b/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/IsUTCToday.cs @@ -7,9 +7,9 @@ using Microsoft.PowerFx.Core.Errors; using Microsoft.PowerFx.Core.Functions; using Microsoft.PowerFx.Core.Localization; -using Microsoft.PowerFx.Core.Syntax.Nodes; using Microsoft.PowerFx.Core.Types; using Microsoft.PowerFx.Core.Utils; +using Microsoft.PowerFx.Syntax; namespace Microsoft.PowerFx.Core.Texl.Builtins { diff --git a/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/LeftRight.cs b/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/LeftRight.cs index cea9b265a4..4d9e544759 100644 --- a/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/LeftRight.cs +++ b/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/LeftRight.cs @@ -6,9 +6,9 @@ using Microsoft.PowerFx.Core.Binding; using Microsoft.PowerFx.Core.Functions; using Microsoft.PowerFx.Core.Localization; -using Microsoft.PowerFx.Core.Syntax.Nodes; using Microsoft.PowerFx.Core.Types; using Microsoft.PowerFx.Core.Utils; +using Microsoft.PowerFx.Syntax; namespace Microsoft.PowerFx.Core.Texl.Builtins { diff --git a/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/Len.cs b/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/Len.cs index c09aa9186a..3388a4dde7 100644 --- a/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/Len.cs +++ b/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/Len.cs @@ -7,9 +7,9 @@ using Microsoft.PowerFx.Core.Functions; using Microsoft.PowerFx.Core.Functions.Delegation; using Microsoft.PowerFx.Core.Localization; -using Microsoft.PowerFx.Core.Syntax.Nodes; using Microsoft.PowerFx.Core.Types; using Microsoft.PowerFx.Core.Utils; +using Microsoft.PowerFx.Syntax; namespace Microsoft.PowerFx.Core.Texl.Builtins { diff --git a/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/Log.cs b/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/Log.cs index 40cd1bb377..2fa303033e 100644 --- a/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/Log.cs +++ b/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/Log.cs @@ -5,9 +5,9 @@ using Microsoft.PowerFx.Core.App.ErrorContainers; using Microsoft.PowerFx.Core.Functions; using Microsoft.PowerFx.Core.Localization; -using Microsoft.PowerFx.Core.Syntax.Nodes; using Microsoft.PowerFx.Core.Types; using Microsoft.PowerFx.Core.Utils; +using Microsoft.PowerFx.Syntax; namespace Microsoft.PowerFx.Core.Texl.Builtins { @@ -74,4 +74,4 @@ public override bool CheckInvocation(TexlNode[] args, DType[] argTypes, IErrorCo return fValid; } } -} \ No newline at end of file +} diff --git a/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/Logical.cs b/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/Logical.cs index 04f0e49e3a..12152017fc 100644 --- a/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/Logical.cs +++ b/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/Logical.cs @@ -7,10 +7,9 @@ using Microsoft.PowerFx.Core.Functions; using Microsoft.PowerFx.Core.Functions.Delegation; using Microsoft.PowerFx.Core.Localization; -using Microsoft.PowerFx.Core.Syntax; -using Microsoft.PowerFx.Core.Syntax.Nodes; using Microsoft.PowerFx.Core.Types; using Microsoft.PowerFx.Core.Utils; +using Microsoft.PowerFx.Syntax; namespace Microsoft.PowerFx.Core.Texl.Builtins { diff --git a/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/Lookup.cs b/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/Lookup.cs index 96bc58d4da..548b090379 100644 --- a/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/Lookup.cs +++ b/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/Lookup.cs @@ -10,9 +10,9 @@ using Microsoft.PowerFx.Core.Functions.Delegation; using Microsoft.PowerFx.Core.Functions.Delegation.DelegationMetadata; using Microsoft.PowerFx.Core.Localization; -using Microsoft.PowerFx.Core.Syntax.Nodes; using Microsoft.PowerFx.Core.Types; using Microsoft.PowerFx.Core.Utils; +using Microsoft.PowerFx.Syntax; namespace Microsoft.PowerFx.Core.Texl.Builtins { diff --git a/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/LowerUpper.cs b/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/LowerUpper.cs index 19d14157d2..41da68a9ee 100644 --- a/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/LowerUpper.cs +++ b/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/LowerUpper.cs @@ -4,9 +4,9 @@ using Microsoft.PowerFx.Core.Binding; using Microsoft.PowerFx.Core.Functions.Delegation; using Microsoft.PowerFx.Core.Localization; -using Microsoft.PowerFx.Core.Syntax.Nodes; using Microsoft.PowerFx.Core.Types; using Microsoft.PowerFx.Core.Utils; +using Microsoft.PowerFx.Syntax; namespace Microsoft.PowerFx.Core.Texl.Builtins { diff --git a/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/MathFunction.cs b/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/MathFunction.cs index b6db156a5f..f440bfe818 100644 --- a/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/MathFunction.cs +++ b/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/MathFunction.cs @@ -6,9 +6,9 @@ using Microsoft.PowerFx.Core.App.ErrorContainers; using Microsoft.PowerFx.Core.Functions; using Microsoft.PowerFx.Core.Localization; -using Microsoft.PowerFx.Core.Syntax.Nodes; using Microsoft.PowerFx.Core.Types; using Microsoft.PowerFx.Core.Utils; +using Microsoft.PowerFx.Syntax; namespace Microsoft.PowerFx.Core.Texl.Builtins { diff --git a/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/Mid.cs b/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/Mid.cs index 914fbb79ae..091a61fd05 100644 --- a/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/Mid.cs +++ b/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/Mid.cs @@ -7,9 +7,9 @@ using Microsoft.PowerFx.Core.Errors; using Microsoft.PowerFx.Core.Functions; using Microsoft.PowerFx.Core.Localization; -using Microsoft.PowerFx.Core.Syntax.Nodes; using Microsoft.PowerFx.Core.Types; using Microsoft.PowerFx.Core.Utils; +using Microsoft.PowerFx.Syntax; namespace Microsoft.PowerFx.Core.Texl.Builtins { diff --git a/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/MinMax.cs b/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/MinMax.cs index f4720ead57..6922a00583 100644 --- a/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/MinMax.cs +++ b/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/MinMax.cs @@ -7,9 +7,9 @@ using Microsoft.PowerFx.Core.Errors; using Microsoft.PowerFx.Core.Functions; using Microsoft.PowerFx.Core.Localization; -using Microsoft.PowerFx.Core.Syntax.Nodes; using Microsoft.PowerFx.Core.Types; using Microsoft.PowerFx.Core.Utils; +using Microsoft.PowerFx.Syntax; namespace Microsoft.PowerFx.Core.Texl.Builtins { diff --git a/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/MinMaxTable.cs b/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/MinMaxTable.cs index 3f18237011..c81a7ad80a 100644 --- a/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/MinMaxTable.cs +++ b/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/MinMaxTable.cs @@ -6,9 +6,9 @@ using Microsoft.PowerFx.Core.Errors; using Microsoft.PowerFx.Core.Functions.Delegation; using Microsoft.PowerFx.Core.Localization; -using Microsoft.PowerFx.Core.Syntax.Nodes; using Microsoft.PowerFx.Core.Types; using Microsoft.PowerFx.Core.Utils; +using Microsoft.PowerFx.Syntax; namespace Microsoft.PowerFx.Core.Texl.Builtins { diff --git a/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/Mod.cs b/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/Mod.cs index 54bed46371..f7790c12d0 100644 --- a/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/Mod.cs +++ b/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/Mod.cs @@ -6,9 +6,9 @@ using Microsoft.PowerFx.Core.Errors; using Microsoft.PowerFx.Core.Functions; using Microsoft.PowerFx.Core.Localization; -using Microsoft.PowerFx.Core.Syntax.Nodes; using Microsoft.PowerFx.Core.Types; using Microsoft.PowerFx.Core.Utils; +using Microsoft.PowerFx.Syntax; namespace Microsoft.PowerFx.Core.Texl.Builtins { diff --git a/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/NotFunction.cs b/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/NotFunction.cs index 6f287d9830..694cbbc938 100644 --- a/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/NotFunction.cs +++ b/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/NotFunction.cs @@ -6,12 +6,10 @@ using Microsoft.PowerFx.Core.Functions; using Microsoft.PowerFx.Core.Functions.Delegation; using Microsoft.PowerFx.Core.Functions.Delegation.DelegationStrategies; -using Microsoft.PowerFx.Core.Lexer; using Microsoft.PowerFx.Core.Localization; -using Microsoft.PowerFx.Core.Syntax; -using Microsoft.PowerFx.Core.Syntax.Nodes; using Microsoft.PowerFx.Core.Types; using Microsoft.PowerFx.Core.Utils; +using Microsoft.PowerFx.Syntax; namespace Microsoft.PowerFx.Core.Texl.Builtins { @@ -120,4 +118,4 @@ public override bool IsRowScopedServerDelegatable(CallNode callNode, TexlBinding } } } -} \ No newline at end of file +} diff --git a/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/Power.cs b/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/Power.cs index 42768305c8..1c10d65104 100644 --- a/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/Power.cs +++ b/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/Power.cs @@ -5,9 +5,9 @@ using Microsoft.PowerFx.Core.App.ErrorContainers; using Microsoft.PowerFx.Core.Functions; using Microsoft.PowerFx.Core.Localization; -using Microsoft.PowerFx.Core.Syntax.Nodes; using Microsoft.PowerFx.Core.Types; using Microsoft.PowerFx.Core.Utils; +using Microsoft.PowerFx.Syntax; namespace Microsoft.PowerFx.Core.Texl.Builtins { diff --git a/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/Proper.cs b/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/Proper.cs index 497fd6790c..8d49ff63e6 100644 --- a/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/Proper.cs +++ b/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/Proper.cs @@ -4,8 +4,8 @@ using Microsoft.PowerFx.Core.Binding; using Microsoft.PowerFx.Core.Functions.Delegation; using Microsoft.PowerFx.Core.Localization; -using Microsoft.PowerFx.Core.Syntax.Nodes; using Microsoft.PowerFx.Core.Types; +using Microsoft.PowerFx.Syntax; namespace Microsoft.PowerFx.Core.Texl.Builtins { diff --git a/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/Replace.cs b/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/Replace.cs index e0c3b3e913..794044a24e 100644 --- a/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/Replace.cs +++ b/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/Replace.cs @@ -7,9 +7,9 @@ using Microsoft.PowerFx.Core.Errors; using Microsoft.PowerFx.Core.Functions; using Microsoft.PowerFx.Core.Localization; -using Microsoft.PowerFx.Core.Syntax.Nodes; using Microsoft.PowerFx.Core.Types; using Microsoft.PowerFx.Core.Utils; +using Microsoft.PowerFx.Syntax; namespace Microsoft.PowerFx.Core.Texl.Builtins { diff --git a/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/Round.cs b/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/Round.cs index cc9b094b57..076e29095f 100644 --- a/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/Round.cs +++ b/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/Round.cs @@ -7,9 +7,9 @@ using Microsoft.PowerFx.Core.Errors; using Microsoft.PowerFx.Core.Functions; using Microsoft.PowerFx.Core.Localization; -using Microsoft.PowerFx.Core.Syntax.Nodes; using Microsoft.PowerFx.Core.Types; using Microsoft.PowerFx.Core.Utils; +using Microsoft.PowerFx.Syntax; namespace Microsoft.PowerFx.Core.Texl.Builtins { diff --git a/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/ShowColumns.cs b/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/ShowColumns.cs index 4b01653b5d..13f8328285 100644 --- a/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/ShowColumns.cs +++ b/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/ShowColumns.cs @@ -7,9 +7,9 @@ using Microsoft.PowerFx.Core.Entities.QueryOptions; using Microsoft.PowerFx.Core.Errors; using Microsoft.PowerFx.Core.Localization; -using Microsoft.PowerFx.Core.Syntax.Nodes; using Microsoft.PowerFx.Core.Types; using Microsoft.PowerFx.Core.Utils; +using Microsoft.PowerFx.Syntax; namespace Microsoft.PowerFx.Core.Texl.Builtins { diff --git a/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/Shuffle.cs b/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/Shuffle.cs index dff1014bba..5a8800262b 100644 --- a/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/Shuffle.cs +++ b/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/Shuffle.cs @@ -5,9 +5,9 @@ using Microsoft.PowerFx.Core.App.ErrorContainers; using Microsoft.PowerFx.Core.Functions; using Microsoft.PowerFx.Core.Localization; -using Microsoft.PowerFx.Core.Syntax.Nodes; using Microsoft.PowerFx.Core.Types; using Microsoft.PowerFx.Core.Utils; +using Microsoft.PowerFx.Syntax; namespace Microsoft.PowerFx.Core.Texl.Builtins { diff --git a/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/Sort.cs b/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/Sort.cs index 5a48ebc7e6..169298712d 100644 --- a/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/Sort.cs +++ b/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/Sort.cs @@ -14,10 +14,9 @@ using Microsoft.PowerFx.Core.Functions.FunctionArgValidators; using Microsoft.PowerFx.Core.Localization; using Microsoft.PowerFx.Core.Logging.Trackers; -using Microsoft.PowerFx.Core.Syntax; -using Microsoft.PowerFx.Core.Syntax.Nodes; using Microsoft.PowerFx.Core.Types; using Microsoft.PowerFx.Core.Utils; +using Microsoft.PowerFx.Syntax; namespace Microsoft.PowerFx.Core.Texl.Builtins { diff --git a/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/SortByColumns.cs b/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/SortByColumns.cs index 2e034b8fa7..f44462dfb9 100644 --- a/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/SortByColumns.cs +++ b/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/SortByColumns.cs @@ -14,10 +14,9 @@ using Microsoft.PowerFx.Core.Functions.Delegation.DelegationMetadata; using Microsoft.PowerFx.Core.Functions.FunctionArgValidators; using Microsoft.PowerFx.Core.Localization; -using Microsoft.PowerFx.Core.Syntax; -using Microsoft.PowerFx.Core.Syntax.Nodes; using Microsoft.PowerFx.Core.Types; using Microsoft.PowerFx.Core.Utils; +using Microsoft.PowerFx.Syntax; namespace Microsoft.PowerFx.Core.Texl.Builtins { diff --git a/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/Split.cs b/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/Split.cs index 2e7c21354a..aabb0f6dbc 100644 --- a/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/Split.cs +++ b/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/Split.cs @@ -5,9 +5,9 @@ using Microsoft.PowerFx.Core.App.ErrorContainers; using Microsoft.PowerFx.Core.Binding; using Microsoft.PowerFx.Core.Localization; -using Microsoft.PowerFx.Core.Syntax.Nodes; using Microsoft.PowerFx.Core.Types; using Microsoft.PowerFx.Core.Utils; +using Microsoft.PowerFx.Syntax; namespace Microsoft.PowerFx.Core.Texl.Builtins { diff --git a/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/StartsWith.cs b/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/StartsWith.cs index 49efdab786..e3778ca453 100644 --- a/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/StartsWith.cs +++ b/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/StartsWith.cs @@ -5,8 +5,8 @@ using Microsoft.PowerFx.Core.Binding; using Microsoft.PowerFx.Core.Functions.Delegation; using Microsoft.PowerFx.Core.Localization; -using Microsoft.PowerFx.Core.Syntax.Nodes; using Microsoft.PowerFx.Core.Utils; +using Microsoft.PowerFx.Syntax; namespace Microsoft.PowerFx.Core.Texl.Builtins { @@ -38,4 +38,4 @@ public override bool IsRowScopedServerDelegatable(CallNode callNode, TexlBinding // TASK: 856362 // Add overload for single-column table as the input. } -} \ No newline at end of file +} diff --git a/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/Statistical.cs b/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/Statistical.cs index 665ab906a8..d3656a01b0 100644 --- a/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/Statistical.cs +++ b/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/Statistical.cs @@ -6,9 +6,9 @@ using Microsoft.PowerFx.Core.Errors; using Microsoft.PowerFx.Core.Functions; using Microsoft.PowerFx.Core.Localization; -using Microsoft.PowerFx.Core.Syntax.Nodes; using Microsoft.PowerFx.Core.Types; using Microsoft.PowerFx.Core.Utils; +using Microsoft.PowerFx.Syntax; namespace Microsoft.PowerFx.Core.Texl.Builtins { diff --git a/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/StatisticalTableFunction.cs b/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/StatisticalTableFunction.cs index 7f1f921935..606b2dc976 100644 --- a/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/StatisticalTableFunction.cs +++ b/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/StatisticalTableFunction.cs @@ -9,10 +9,9 @@ using Microsoft.PowerFx.Core.Functions.Delegation; using Microsoft.PowerFx.Core.Localization; using Microsoft.PowerFx.Core.Logging.Trackers; -using Microsoft.PowerFx.Core.Syntax; -using Microsoft.PowerFx.Core.Syntax.Nodes; using Microsoft.PowerFx.Core.Types; using Microsoft.PowerFx.Core.Utils; +using Microsoft.PowerFx.Syntax; namespace Microsoft.PowerFx.Core.Texl.Builtins { @@ -111,4 +110,4 @@ private bool ExpressionContainsView(CallNode callNode, TexlBinding binding) return viewFinderVisitor.ContainsView; } } -} \ No newline at end of file +} diff --git a/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/StringOneArgFunction.cs b/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/StringOneArgFunction.cs index f7814755fd..db0ac8b6e4 100644 --- a/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/StringOneArgFunction.cs +++ b/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/StringOneArgFunction.cs @@ -8,10 +8,9 @@ using Microsoft.PowerFx.Core.Functions; using Microsoft.PowerFx.Core.Functions.Delegation; using Microsoft.PowerFx.Core.Localization; -using Microsoft.PowerFx.Core.Syntax; -using Microsoft.PowerFx.Core.Syntax.Nodes; using Microsoft.PowerFx.Core.Types; using Microsoft.PowerFx.Core.Utils; +using Microsoft.PowerFx.Syntax; namespace Microsoft.PowerFx.Core.Texl.Builtins { diff --git a/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/StringTwoArgFunction.cs b/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/StringTwoArgFunction.cs index de638fdae0..c959cb7f72 100644 --- a/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/StringTwoArgFunction.cs +++ b/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/StringTwoArgFunction.cs @@ -6,10 +6,9 @@ using Microsoft.PowerFx.Core.Functions; using Microsoft.PowerFx.Core.Functions.Delegation; using Microsoft.PowerFx.Core.Localization; -using Microsoft.PowerFx.Core.Syntax; -using Microsoft.PowerFx.Core.Syntax.Nodes; using Microsoft.PowerFx.Core.Types; using Microsoft.PowerFx.Core.Utils; +using Microsoft.PowerFx.Syntax; namespace Microsoft.PowerFx.Core.Texl.Builtins { @@ -100,4 +99,4 @@ public override bool HasSuggestionsForParam(int index) return index == 0; } } -} \ No newline at end of file +} diff --git a/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/Substitute.cs b/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/Substitute.cs index 92e8855afe..c15c4b6175 100644 --- a/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/Substitute.cs +++ b/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/Substitute.cs @@ -7,9 +7,9 @@ using Microsoft.PowerFx.Core.Errors; using Microsoft.PowerFx.Core.Functions; using Microsoft.PowerFx.Core.Localization; -using Microsoft.PowerFx.Core.Syntax.Nodes; using Microsoft.PowerFx.Core.Types; using Microsoft.PowerFx.Core.Utils; +using Microsoft.PowerFx.Syntax; namespace Microsoft.PowerFx.Core.Texl.Builtins { diff --git a/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/Switch.cs b/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/Switch.cs index cc1e22fa2d..90694ec518 100644 --- a/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/Switch.cs +++ b/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/Switch.cs @@ -10,9 +10,9 @@ using Microsoft.PowerFx.Core.Functions; using Microsoft.PowerFx.Core.Functions.FunctionArgValidators; using Microsoft.PowerFx.Core.Localization; -using Microsoft.PowerFx.Core.Syntax.Nodes; using Microsoft.PowerFx.Core.Types; using Microsoft.PowerFx.Core.Utils; +using Microsoft.PowerFx.Syntax; namespace Microsoft.PowerFx.Core.Texl.Builtins { diff --git a/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/Table.cs b/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/Table.cs index 4d6c10241f..ebc3ad2cca 100644 --- a/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/Table.cs +++ b/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/Table.cs @@ -7,9 +7,9 @@ using Microsoft.PowerFx.Core.Errors; using Microsoft.PowerFx.Core.Functions; using Microsoft.PowerFx.Core.Localization; -using Microsoft.PowerFx.Core.Syntax.Nodes; using Microsoft.PowerFx.Core.Types; using Microsoft.PowerFx.Core.Utils; +using Microsoft.PowerFx.Syntax; namespace Microsoft.PowerFx.Core.Texl.Builtins { diff --git a/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/Text.cs b/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/Text.cs index 05ee23d9f1..36ce4faaf4 100644 --- a/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/Text.cs +++ b/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/Text.cs @@ -6,10 +6,10 @@ using Microsoft.PowerFx.Core.Errors; using Microsoft.PowerFx.Core.Functions; using Microsoft.PowerFx.Core.Localization; -using Microsoft.PowerFx.Core.Syntax.Nodes; using Microsoft.PowerFx.Core.Types; using Microsoft.PowerFx.Core.Types.Enums; using Microsoft.PowerFx.Core.Utils; +using Microsoft.PowerFx.Syntax; namespace Microsoft.PowerFx.Core.Texl.Builtins { diff --git a/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/Trim.cs b/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/Trim.cs index bec08f8816..af2ca00c88 100644 --- a/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/Trim.cs +++ b/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/Trim.cs @@ -4,9 +4,9 @@ using Microsoft.PowerFx.Core.Binding; using Microsoft.PowerFx.Core.Functions.Delegation; using Microsoft.PowerFx.Core.Localization; -using Microsoft.PowerFx.Core.Syntax.Nodes; using Microsoft.PowerFx.Core.Types; using Microsoft.PowerFx.Core.Utils; +using Microsoft.PowerFx.Syntax; namespace Microsoft.PowerFx.Core.Texl.Builtins { diff --git a/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/Trunc.cs b/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/Trunc.cs index d1acb7353d..d1b5eb41df 100644 --- a/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/Trunc.cs +++ b/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/Trunc.cs @@ -7,9 +7,9 @@ using Microsoft.PowerFx.Core.Errors; using Microsoft.PowerFx.Core.Functions; using Microsoft.PowerFx.Core.Localization; -using Microsoft.PowerFx.Core.Syntax.Nodes; using Microsoft.PowerFx.Core.Types; using Microsoft.PowerFx.Core.Utils; +using Microsoft.PowerFx.Syntax; namespace Microsoft.PowerFx.Core.Texl.Builtins { diff --git a/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/Value.cs b/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/Value.cs index 3d2ea37da6..0e908e4faf 100644 --- a/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/Value.cs +++ b/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/Value.cs @@ -7,9 +7,9 @@ using Microsoft.PowerFx.Core.Errors; using Microsoft.PowerFx.Core.Functions; using Microsoft.PowerFx.Core.Localization; -using Microsoft.PowerFx.Core.Syntax.Nodes; using Microsoft.PowerFx.Core.Types; using Microsoft.PowerFx.Core.Utils; +using Microsoft.PowerFx.Syntax; namespace Microsoft.PowerFx.Core.Texl.Builtins { diff --git a/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/With.cs b/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/With.cs index 9ac812fc6e..202c257523 100644 --- a/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/With.cs +++ b/src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/With.cs @@ -6,9 +6,9 @@ using Microsoft.PowerFx.Core.Binding; using Microsoft.PowerFx.Core.Functions; using Microsoft.PowerFx.Core.Localization; -using Microsoft.PowerFx.Core.Syntax.Nodes; using Microsoft.PowerFx.Core.Types; using Microsoft.PowerFx.Core.Utils; +using Microsoft.PowerFx.Syntax; namespace Microsoft.PowerFx.Core.Texl.Builtins { @@ -81,4 +81,4 @@ public override IEnumerable GetTabularDataSourceArg(CallNode node) return new[] { dsArg }; } } -} \ No newline at end of file +} diff --git a/src/libraries/Microsoft.PowerFx.Core/Texl/Intellisense/AddSuggestionDryRunHelper.cs b/src/libraries/Microsoft.PowerFx.Core/Texl/Intellisense/AddSuggestionDryRunHelper.cs index 8a1a711a20..bb6f516995 100644 --- a/src/libraries/Microsoft.PowerFx.Core/Texl/Intellisense/AddSuggestionDryRunHelper.cs +++ b/src/libraries/Microsoft.PowerFx.Core/Texl/Intellisense/AddSuggestionDryRunHelper.cs @@ -3,7 +3,7 @@ using Microsoft.PowerFx.Core.Types; -namespace Microsoft.PowerFx.Core.Texl.Intellisense +namespace Microsoft.PowerFx.Intellisense { [ThreadSafeImmutable] internal class AddSuggestionDryRunHelper : AddSuggestionHelper diff --git a/src/libraries/Microsoft.PowerFx.Core/Texl/Intellisense/AddSuggestionHelper.cs b/src/libraries/Microsoft.PowerFx.Core/Texl/Intellisense/AddSuggestionHelper.cs index 0a1c6d102d..c03fae8713 100644 --- a/src/libraries/Microsoft.PowerFx.Core/Texl/Intellisense/AddSuggestionHelper.cs +++ b/src/libraries/Microsoft.PowerFx.Core/Texl/Intellisense/AddSuggestionHelper.cs @@ -2,11 +2,11 @@ // Licensed under the MIT license. using System; -using Microsoft.PowerFx.Core.Lexer; using Microsoft.PowerFx.Core.Types; using Microsoft.PowerFx.Core.Utils; +using Microsoft.PowerFx.Syntax; -namespace Microsoft.PowerFx.Core.Texl.Intellisense +namespace Microsoft.PowerFx.Intellisense { [ThreadSafeImmutable] internal class AddSuggestionHelper diff --git a/src/libraries/Microsoft.PowerFx.Core/Texl/Intellisense/ArgumentSuggestions.cs b/src/libraries/Microsoft.PowerFx.Core/Texl/Intellisense/ArgumentSuggestions.cs index 3856205760..5269970409 100644 --- a/src/libraries/Microsoft.PowerFx.Core/Texl/Intellisense/ArgumentSuggestions.cs +++ b/src/libraries/Microsoft.PowerFx.Core/Texl/Intellisense/ArgumentSuggestions.cs @@ -6,14 +6,14 @@ using System.Linq; using System.Threading; using Microsoft.PowerFx.Core.Functions; -using Microsoft.PowerFx.Core.Lexer; using Microsoft.PowerFx.Core.Localization; using Microsoft.PowerFx.Core.Texl.Builtins; using Microsoft.PowerFx.Core.Types; using Microsoft.PowerFx.Core.Types.Enums; using Microsoft.PowerFx.Core.Utils; +using Microsoft.PowerFx.Syntax; -namespace Microsoft.PowerFx.Core.Texl.Intellisense +namespace Microsoft.PowerFx.Intellisense { internal static class ArgumentSuggestions { @@ -217,4 +217,4 @@ private static IEnumerable> IfSuggestions(TryGetEnum .Select(name => new KeyValuePair(TexlLexer.EscapeName(name.Name.Value), name.Type)); } } -} \ No newline at end of file +} diff --git a/src/libraries/Microsoft.PowerFx.Core/Texl/Intellisense/FormatResult.cs b/src/libraries/Microsoft.PowerFx.Core/Texl/Intellisense/FormatResult.cs index b056c4541c..b67bf30532 100644 --- a/src/libraries/Microsoft.PowerFx.Core/Texl/Intellisense/FormatResult.cs +++ b/src/libraries/Microsoft.PowerFx.Core/Texl/Intellisense/FormatResult.cs @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. // Licensed under the MIT license. -namespace Microsoft.PowerFx.Core.Texl.Intellisense +namespace Microsoft.PowerFx.Intellisense { internal sealed class FormatResult { diff --git a/src/libraries/Microsoft.PowerFx.Core/Texl/Intellisense/FunctionCategoryProvider.cs b/src/libraries/Microsoft.PowerFx.Core/Texl/Intellisense/FunctionCategoryProvider.cs index dd824d9b4e..8b6040fb5d 100644 --- a/src/libraries/Microsoft.PowerFx.Core/Texl/Intellisense/FunctionCategoryProvider.cs +++ b/src/libraries/Microsoft.PowerFx.Core/Texl/Intellisense/FunctionCategoryProvider.cs @@ -7,7 +7,7 @@ using Microsoft.PowerFx.Core.Localization; using Microsoft.PowerFx.Core.Types; -namespace Microsoft.PowerFx.Core.Texl.Intellisense +namespace Microsoft.PowerFx.Intellisense { internal sealed class FunctionCategoryProvider { diff --git a/src/libraries/Microsoft.PowerFx.Core/Texl/Intellisense/IIntellisense.cs b/src/libraries/Microsoft.PowerFx.Core/Texl/Intellisense/IIntellisense.cs index d1bc004702..79ff8b24be 100644 --- a/src/libraries/Microsoft.PowerFx.Core/Texl/Intellisense/IIntellisense.cs +++ b/src/libraries/Microsoft.PowerFx.Core/Texl/Intellisense/IIntellisense.cs @@ -2,9 +2,9 @@ // Licensed under the MIT license. using Microsoft.PowerFx.Core.Binding; -using Microsoft.PowerFx.Core.Syntax; +using Microsoft.PowerFx.Syntax; -namespace Microsoft.PowerFx.Core.Texl.Intellisense +namespace Microsoft.PowerFx.Intellisense { internal interface IIntellisense { diff --git a/src/libraries/Microsoft.PowerFx.Core/Texl/Intellisense/IIntellisenseContext.cs b/src/libraries/Microsoft.PowerFx.Core/Texl/Intellisense/IIntellisenseContext.cs index 680f59e6ba..8b5654454d 100644 --- a/src/libraries/Microsoft.PowerFx.Core/Texl/Intellisense/IIntellisenseContext.cs +++ b/src/libraries/Microsoft.PowerFx.Core/Texl/Intellisense/IIntellisenseContext.cs @@ -3,7 +3,7 @@ using Microsoft.AppMagic.Transport; -namespace Microsoft.PowerFx.Core.Texl.Intellisense +namespace Microsoft.PowerFx.Intellisense { [TransportType(TransportKind.ByValue)] internal interface IIntellisenseContext diff --git a/src/libraries/Microsoft.PowerFx.Core/Texl/Intellisense/IIntellisenseResult.cs b/src/libraries/Microsoft.PowerFx.Core/Texl/Intellisense/IIntellisenseResult.cs index acd647c8dd..b9d711ef50 100644 --- a/src/libraries/Microsoft.PowerFx.Core/Texl/Intellisense/IIntellisenseResult.cs +++ b/src/libraries/Microsoft.PowerFx.Core/Texl/Intellisense/IIntellisenseResult.cs @@ -4,7 +4,7 @@ using System; using System.Collections.Generic; -namespace Microsoft.PowerFx.Core.Texl.Intellisense +namespace Microsoft.PowerFx.Intellisense { public interface IIntellisenseResult { diff --git a/src/libraries/Microsoft.PowerFx.Core/Texl/Intellisense/IIntellisenseSuggestion.cs b/src/libraries/Microsoft.PowerFx.Core/Texl/Intellisense/IIntellisenseSuggestion.cs index a39a7e55e9..a05651812d 100644 --- a/src/libraries/Microsoft.PowerFx.Core/Texl/Intellisense/IIntellisenseSuggestion.cs +++ b/src/libraries/Microsoft.PowerFx.Core/Texl/Intellisense/IIntellisenseSuggestion.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; -namespace Microsoft.PowerFx.Core.Texl.Intellisense +namespace Microsoft.PowerFx.Intellisense { public interface IIntellisenseSuggestion { diff --git a/src/libraries/Microsoft.PowerFx.Core/Texl/Intellisense/Intellisense.cs b/src/libraries/Microsoft.PowerFx.Core/Texl/Intellisense/Intellisense.cs index c3190898ac..6a69c91d4e 100644 --- a/src/libraries/Microsoft.PowerFx.Core/Texl/Intellisense/Intellisense.cs +++ b/src/libraries/Microsoft.PowerFx.Core/Texl/Intellisense/Intellisense.cs @@ -5,17 +5,14 @@ using System.Collections.Generic; using System.Linq; using Microsoft.PowerFx.Core.Binding; -using Microsoft.PowerFx.Core.Binding.BindInfo; using Microsoft.PowerFx.Core.Functions; -using Microsoft.PowerFx.Core.Lexer.Tokens; -using Microsoft.PowerFx.Core.Syntax; -using Microsoft.PowerFx.Core.Syntax.Nodes; -using Microsoft.PowerFx.Core.Texl.Intellisense.IntellisenseData; using Microsoft.PowerFx.Core.Types; using Microsoft.PowerFx.Core.Types.Enums; using Microsoft.PowerFx.Core.Utils; +using Microsoft.PowerFx.Intellisense.IntellisenseData; +using Microsoft.PowerFx.Syntax; -namespace Microsoft.PowerFx.Core.Texl.Intellisense +namespace Microsoft.PowerFx.Intellisense { internal delegate bool IsValidSuggestion(IntellisenseData.IntellisenseData intellisenseData, IntellisenseSuggestion suggestion); diff --git a/src/libraries/Microsoft.PowerFx.Core/Texl/Intellisense/IntellisenseContext.cs b/src/libraries/Microsoft.PowerFx.Core/Texl/Intellisense/IntellisenseContext.cs index bfd47252da..4e84f54086 100644 --- a/src/libraries/Microsoft.PowerFx.Core/Texl/Intellisense/IntellisenseContext.cs +++ b/src/libraries/Microsoft.PowerFx.Core/Texl/Intellisense/IntellisenseContext.cs @@ -3,7 +3,7 @@ using Microsoft.PowerFx.Core.Utils; -namespace Microsoft.PowerFx.Core.Texl.Intellisense +namespace Microsoft.PowerFx.Intellisense { internal class IntellisenseContext : IIntellisenseContext { diff --git a/src/libraries/Microsoft.PowerFx.Core/Texl/Intellisense/IntellisenseData/DefaultIntellisenseData.cs b/src/libraries/Microsoft.PowerFx.Core/Texl/Intellisense/IntellisenseData/DefaultIntellisenseData.cs index 531dfefbc5..49ba97d6d4 100644 --- a/src/libraries/Microsoft.PowerFx.Core/Texl/Intellisense/IntellisenseData/DefaultIntellisenseData.cs +++ b/src/libraries/Microsoft.PowerFx.Core/Texl/Intellisense/IntellisenseData/DefaultIntellisenseData.cs @@ -3,7 +3,7 @@ using Microsoft.PowerFx.Core.Functions; -namespace Microsoft.PowerFx.Core.Texl.Intellisense.IntellisenseData +namespace Microsoft.PowerFx.Intellisense.IntellisenseData { /// /// This class represents the default intellisense result. diff --git a/src/libraries/Microsoft.PowerFx.Core/Texl/Intellisense/IntellisenseData/IIntellisenseData.cs b/src/libraries/Microsoft.PowerFx.Core/Texl/Intellisense/IntellisenseData/IIntellisenseData.cs index 278c35ca7c..9424278e91 100644 --- a/src/libraries/Microsoft.PowerFx.Core/Texl/Intellisense/IntellisenseData/IIntellisenseData.cs +++ b/src/libraries/Microsoft.PowerFx.Core/Texl/Intellisense/IntellisenseData/IIntellisenseData.cs @@ -3,7 +3,7 @@ using Microsoft.PowerFx.Core.Functions; -namespace Microsoft.PowerFx.Core.Texl.Intellisense.IntellisenseData +namespace Microsoft.PowerFx.Intellisense.IntellisenseData { /// /// A transient runtime representation of data necessary to complete . diff --git a/src/libraries/Microsoft.PowerFx.Core/Texl/Intellisense/IntellisenseData/IntellisenseData.cs b/src/libraries/Microsoft.PowerFx.Core/Texl/Intellisense/IntellisenseData/IntellisenseData.cs index 65d39f61b4..f701fdaefc 100644 --- a/src/libraries/Microsoft.PowerFx.Core/Texl/Intellisense/IntellisenseData/IntellisenseData.cs +++ b/src/libraries/Microsoft.PowerFx.Core/Texl/Intellisense/IntellisenseData/IntellisenseData.cs @@ -6,15 +6,12 @@ using Microsoft.PowerFx.Core.Binding; using Microsoft.PowerFx.Core.Entities; using Microsoft.PowerFx.Core.Functions; -using Microsoft.PowerFx.Core.Lexer; -using Microsoft.PowerFx.Core.Lexer.Tokens; -using Microsoft.PowerFx.Core.Syntax; -using Microsoft.PowerFx.Core.Syntax.Nodes; using Microsoft.PowerFx.Core.Types; using Microsoft.PowerFx.Core.Types.Enums; using Microsoft.PowerFx.Core.Utils; +using Microsoft.PowerFx.Syntax; -namespace Microsoft.PowerFx.Core.Texl.Intellisense.IntellisenseData +namespace Microsoft.PowerFx.Intellisense.IntellisenseData { // The IntellisenseData class contains the pre-parsed data for Intellisense to provide suggestions internal class IntellisenseData : IIntellisenseData diff --git a/src/libraries/Microsoft.PowerFx.Core/Texl/Intellisense/IntellisenseHelper.cs b/src/libraries/Microsoft.PowerFx.Core/Texl/Intellisense/IntellisenseHelper.cs index 6d82bf6bbf..53997ddaf4 100644 --- a/src/libraries/Microsoft.PowerFx.Core/Texl/Intellisense/IntellisenseHelper.cs +++ b/src/libraries/Microsoft.PowerFx.Core/Texl/Intellisense/IntellisenseHelper.cs @@ -7,14 +7,12 @@ using Microsoft.PowerFx.Core.Binding; using Microsoft.PowerFx.Core.Binding.BindInfo; using Microsoft.PowerFx.Core.Functions; -using Microsoft.PowerFx.Core.Lexer; -using Microsoft.PowerFx.Core.Syntax; -using Microsoft.PowerFx.Core.Syntax.Nodes; using Microsoft.PowerFx.Core.Types; using Microsoft.PowerFx.Core.Types.Enums; using Microsoft.PowerFx.Core.Utils; +using Microsoft.PowerFx.Syntax; -namespace Microsoft.PowerFx.Core.Texl.Intellisense +namespace Microsoft.PowerFx.Intellisense { internal static class IntellisenseHelper { diff --git a/src/libraries/Microsoft.PowerFx.Core/Texl/Intellisense/IntellisenseProvider.cs b/src/libraries/Microsoft.PowerFx.Core/Texl/Intellisense/IntellisenseProvider.cs index acd74a8868..9b378d13b2 100644 --- a/src/libraries/Microsoft.PowerFx.Core/Texl/Intellisense/IntellisenseProvider.cs +++ b/src/libraries/Microsoft.PowerFx.Core/Texl/Intellisense/IntellisenseProvider.cs @@ -3,7 +3,7 @@ using Microsoft.PowerFx.Core.Types.Enums; -namespace Microsoft.PowerFx.Core.Texl.Intellisense +namespace Microsoft.PowerFx.Intellisense { internal static class IntellisenseProvider { diff --git a/src/libraries/Microsoft.PowerFx.Core/Texl/Intellisense/IntellisenseResult.cs b/src/libraries/Microsoft.PowerFx.Core/Texl/Intellisense/IntellisenseResult.cs index 7e81a76fe1..b4c897fbd4 100644 --- a/src/libraries/Microsoft.PowerFx.Core/Texl/Intellisense/IntellisenseResult.cs +++ b/src/libraries/Microsoft.PowerFx.Core/Texl/Intellisense/IntellisenseResult.cs @@ -6,12 +6,12 @@ using System.Linq; using System.Text; using Microsoft.PowerFx.Core.Functions; -using Microsoft.PowerFx.Core.Lexer; -using Microsoft.PowerFx.Core.Texl.Intellisense.IntellisenseData; -using Microsoft.PowerFx.Core.Texl.Intellisense.SignatureHelp; using Microsoft.PowerFx.Core.Utils; +using Microsoft.PowerFx.Intellisense.IntellisenseData; +using Microsoft.PowerFx.Intellisense.SignatureHelp; +using Microsoft.PowerFx.Syntax; -namespace Microsoft.PowerFx.Core.Texl.Intellisense +namespace Microsoft.PowerFx.Intellisense { internal class IntellisenseResult : IIntellisenseResult { diff --git a/src/libraries/Microsoft.PowerFx.Core/Texl/Intellisense/IntellisenseSuggestion.cs b/src/libraries/Microsoft.PowerFx.Core/Texl/Intellisense/IntellisenseSuggestion.cs index da54397458..683bf09c99 100644 --- a/src/libraries/Microsoft.PowerFx.Core/Texl/Intellisense/IntellisenseSuggestion.cs +++ b/src/libraries/Microsoft.PowerFx.Core/Texl/Intellisense/IntellisenseSuggestion.cs @@ -5,11 +5,11 @@ using System.Collections.Generic; using System.Text; using Microsoft.PowerFx.Core.Functions; -using Microsoft.PowerFx.Core.Lexer; using Microsoft.PowerFx.Core.Types; using Microsoft.PowerFx.Core.Utils; +using Microsoft.PowerFx.Syntax; -namespace Microsoft.PowerFx.Core.Texl.Intellisense +namespace Microsoft.PowerFx.Intellisense { // Represents an intellisense suggestion. // Implements IComparable as Suggestion will be used in a List that will be sorted. diff --git a/src/libraries/Microsoft.PowerFx.Core/Texl/Intellisense/IntellisenseSuggestionList.cs b/src/libraries/Microsoft.PowerFx.Core/Texl/Intellisense/IntellisenseSuggestionList.cs index 9af1727c84..31e053b31b 100644 --- a/src/libraries/Microsoft.PowerFx.Core/Texl/Intellisense/IntellisenseSuggestionList.cs +++ b/src/libraries/Microsoft.PowerFx.Core/Texl/Intellisense/IntellisenseSuggestionList.cs @@ -7,7 +7,7 @@ using System.Linq; using Microsoft.PowerFx.Core.Utils; -namespace Microsoft.PowerFx.Core.Texl.Intellisense +namespace Microsoft.PowerFx.Intellisense { // Specialized IntellisenseSuggestion list that allows for some effient operations on the list. // For example, checking if the list contains a suggestion with a particular display name is diff --git a/src/libraries/Microsoft.PowerFx.Core/Texl/Intellisense/SignatureHelp/ParameterInformation.cs b/src/libraries/Microsoft.PowerFx.Core/Texl/Intellisense/SignatureHelp/ParameterInformation.cs index 4db64381ed..ba2c2c6692 100644 --- a/src/libraries/Microsoft.PowerFx.Core/Texl/Intellisense/SignatureHelp/ParameterInformation.cs +++ b/src/libraries/Microsoft.PowerFx.Core/Texl/Intellisense/SignatureHelp/ParameterInformation.cs @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. // Licensed under the MIT license. -namespace Microsoft.PowerFx.Core.Texl.Intellisense.SignatureHelp +namespace Microsoft.PowerFx.Intellisense.SignatureHelp { public class ParameterInformation { @@ -9,4 +9,4 @@ public class ParameterInformation public string Documentation { get; set; } } -} \ No newline at end of file +} diff --git a/src/libraries/Microsoft.PowerFx.Core/Texl/Intellisense/SignatureHelp/SignatureHelp.cs b/src/libraries/Microsoft.PowerFx.Core/Texl/Intellisense/SignatureHelp/SignatureHelp.cs index 2891707ef5..fa620c5e30 100644 --- a/src/libraries/Microsoft.PowerFx.Core/Texl/Intellisense/SignatureHelp/SignatureHelp.cs +++ b/src/libraries/Microsoft.PowerFx.Core/Texl/Intellisense/SignatureHelp/SignatureHelp.cs @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. // Licensed under the MIT license. -namespace Microsoft.PowerFx.Core.Texl.Intellisense.SignatureHelp +namespace Microsoft.PowerFx.Intellisense.SignatureHelp { public class SignatureHelp { diff --git a/src/libraries/Microsoft.PowerFx.Core/Texl/Intellisense/SignatureHelp/SignatureInformation.cs b/src/libraries/Microsoft.PowerFx.Core/Texl/Intellisense/SignatureHelp/SignatureInformation.cs index 77ef65cf64..297a224429 100644 --- a/src/libraries/Microsoft.PowerFx.Core/Texl/Intellisense/SignatureHelp/SignatureInformation.cs +++ b/src/libraries/Microsoft.PowerFx.Core/Texl/Intellisense/SignatureHelp/SignatureInformation.cs @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. // Licensed under the MIT license. -namespace Microsoft.PowerFx.Core.Texl.Intellisense.SignatureHelp +namespace Microsoft.PowerFx.Intellisense.SignatureHelp { public class SignatureInformation { diff --git a/src/libraries/Microsoft.PowerFx.Core/Texl/Intellisense/SuggestionHandlers/BinaryOpNodeSuggestionHandler.cs b/src/libraries/Microsoft.PowerFx.Core/Texl/Intellisense/SuggestionHandlers/BinaryOpNodeSuggestionHandler.cs index f88ba3fea8..ce556ee685 100644 --- a/src/libraries/Microsoft.PowerFx.Core/Texl/Intellisense/SuggestionHandlers/BinaryOpNodeSuggestionHandler.cs +++ b/src/libraries/Microsoft.PowerFx.Core/Texl/Intellisense/SuggestionHandlers/BinaryOpNodeSuggestionHandler.cs @@ -1,13 +1,11 @@ // Copyright (c) Microsoft Corporation. // Licensed under the MIT license. -using Microsoft.PowerFx.Core.Lexer; using Microsoft.PowerFx.Core.Parser; -using Microsoft.PowerFx.Core.Syntax; -using Microsoft.PowerFx.Core.Syntax.Nodes; using Microsoft.PowerFx.Core.Utils; +using Microsoft.PowerFx.Syntax; -namespace Microsoft.PowerFx.Core.Texl.Intellisense +namespace Microsoft.PowerFx.Intellisense { internal partial class Intellisense { @@ -47,4 +45,4 @@ internal static void AddSuggestionsForBinaryOperatorKeyWords(IntellisenseData.In } } } -} \ No newline at end of file +} diff --git a/src/libraries/Microsoft.PowerFx.Core/Texl/Intellisense/SuggestionHandlers/BlankNodeSuggestionHandler.cs b/src/libraries/Microsoft.PowerFx.Core/Texl/Intellisense/SuggestionHandlers/BlankNodeSuggestionHandler.cs index 9d59777a3a..bf43d8089c 100644 --- a/src/libraries/Microsoft.PowerFx.Core/Texl/Intellisense/SuggestionHandlers/BlankNodeSuggestionHandler.cs +++ b/src/libraries/Microsoft.PowerFx.Core/Texl/Intellisense/SuggestionHandlers/BlankNodeSuggestionHandler.cs @@ -1,9 +1,9 @@ // Copyright (c) Microsoft Corporation. // Licensed under the MIT license. -using Microsoft.PowerFx.Core.Syntax; +using Microsoft.PowerFx.Syntax; -namespace Microsoft.PowerFx.Core.Texl.Intellisense +namespace Microsoft.PowerFx.Intellisense { internal partial class Intellisense { @@ -15,4 +15,4 @@ public BlankNodeSuggestionHandler() } } } -} \ No newline at end of file +} diff --git a/src/libraries/Microsoft.PowerFx.Core/Texl/Intellisense/SuggestionHandlers/BoolLitNodeSuggestionHandler.cs b/src/libraries/Microsoft.PowerFx.Core/Texl/Intellisense/SuggestionHandlers/BoolLitNodeSuggestionHandler.cs index 6a6f6d37f6..34aedae085 100644 --- a/src/libraries/Microsoft.PowerFx.Core/Texl/Intellisense/SuggestionHandlers/BoolLitNodeSuggestionHandler.cs +++ b/src/libraries/Microsoft.PowerFx.Core/Texl/Intellisense/SuggestionHandlers/BoolLitNodeSuggestionHandler.cs @@ -1,13 +1,11 @@ // Copyright (c) Microsoft Corporation. // Licensed under the MIT license. -using Microsoft.PowerFx.Core.Lexer; -using Microsoft.PowerFx.Core.Syntax; -using Microsoft.PowerFx.Core.Syntax.Nodes; using Microsoft.PowerFx.Core.Types; using Microsoft.PowerFx.Core.Utils; +using Microsoft.PowerFx.Syntax; -namespace Microsoft.PowerFx.Core.Texl.Intellisense +namespace Microsoft.PowerFx.Intellisense { internal partial class Intellisense { @@ -51,4 +49,4 @@ internal override bool TryAddSuggestionsForNodeKind(IntellisenseData.Intellisens } } } -} \ No newline at end of file +} diff --git a/src/libraries/Microsoft.PowerFx.Core/Texl/Intellisense/SuggestionHandlers/CallNodeSuggestionHandler.cs b/src/libraries/Microsoft.PowerFx.Core/Texl/Intellisense/SuggestionHandlers/CallNodeSuggestionHandler.cs index b859d7fd60..ee606b2e25 100644 --- a/src/libraries/Microsoft.PowerFx.Core/Texl/Intellisense/SuggestionHandlers/CallNodeSuggestionHandler.cs +++ b/src/libraries/Microsoft.PowerFx.Core/Texl/Intellisense/SuggestionHandlers/CallNodeSuggestionHandler.cs @@ -2,12 +2,10 @@ // Licensed under the MIT license. using System.Linq; -using Microsoft.PowerFx.Core.Lexer; -using Microsoft.PowerFx.Core.Syntax; -using Microsoft.PowerFx.Core.Syntax.Nodes; using Microsoft.PowerFx.Core.Utils; +using Microsoft.PowerFx.Syntax; -namespace Microsoft.PowerFx.Core.Texl.Intellisense +namespace Microsoft.PowerFx.Intellisense { internal partial class Intellisense { @@ -95,4 +93,4 @@ internal override bool TryAddSuggestionsForNodeKind(IntellisenseData.Intellisens } } } -} \ No newline at end of file +} diff --git a/src/libraries/Microsoft.PowerFx.Core/Texl/Intellisense/SuggestionHandlers/CleanupHandlers/ISpecialCaseHandler.cs b/src/libraries/Microsoft.PowerFx.Core/Texl/Intellisense/SuggestionHandlers/CleanupHandlers/ISpecialCaseHandler.cs index 6927ff63c4..12c289ab7d 100644 --- a/src/libraries/Microsoft.PowerFx.Core/Texl/Intellisense/SuggestionHandlers/CleanupHandlers/ISpecialCaseHandler.cs +++ b/src/libraries/Microsoft.PowerFx.Core/Texl/Intellisense/SuggestionHandlers/CleanupHandlers/ISpecialCaseHandler.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; -namespace Microsoft.PowerFx.Core.Texl.Intellisense +namespace Microsoft.PowerFx.Intellisense { internal interface ISpecialCaseHandler { diff --git a/src/libraries/Microsoft.PowerFx.Core/Texl/Intellisense/SuggestionHandlers/CleanupHandlers/StringSuggestionHandler.cs b/src/libraries/Microsoft.PowerFx.Core/Texl/Intellisense/SuggestionHandlers/CleanupHandlers/StringSuggestionHandler.cs index bdc2aa0d95..f79835c285 100644 --- a/src/libraries/Microsoft.PowerFx.Core/Texl/Intellisense/SuggestionHandlers/CleanupHandlers/StringSuggestionHandler.cs +++ b/src/libraries/Microsoft.PowerFx.Core/Texl/Intellisense/SuggestionHandlers/CleanupHandlers/StringSuggestionHandler.cs @@ -2,10 +2,10 @@ // Licensed under the MIT license. using System.Collections.Generic; -using Microsoft.PowerFx.Core.Lexer; using Microsoft.PowerFx.Core.Utils; +using Microsoft.PowerFx.Syntax; -namespace Microsoft.PowerFx.Core.Texl.Intellisense +namespace Microsoft.PowerFx.Intellisense { internal sealed class StringSuggestionHandler : ISpecialCaseHandler { diff --git a/src/libraries/Microsoft.PowerFx.Core/Texl/Intellisense/SuggestionHandlers/CommentNodeSuggestionHandler.cs b/src/libraries/Microsoft.PowerFx.Core/Texl/Intellisense/SuggestionHandlers/CommentNodeSuggestionHandler.cs index 63e7b54685..c8a12db93f 100644 --- a/src/libraries/Microsoft.PowerFx.Core/Texl/Intellisense/SuggestionHandlers/CommentNodeSuggestionHandler.cs +++ b/src/libraries/Microsoft.PowerFx.Core/Texl/Intellisense/SuggestionHandlers/CommentNodeSuggestionHandler.cs @@ -4,7 +4,7 @@ using System.Linq; using Microsoft.PowerFx.Core.Utils; -namespace Microsoft.PowerFx.Core.Texl.Intellisense +namespace Microsoft.PowerFx.Intellisense { internal partial class Intellisense { diff --git a/src/libraries/Microsoft.PowerFx.Core/Texl/Intellisense/SuggestionHandlers/DottedNameNodeSuggestionHandler.cs b/src/libraries/Microsoft.PowerFx.Core/Texl/Intellisense/SuggestionHandlers/DottedNameNodeSuggestionHandler.cs index 7514bd32b7..41a6675da3 100644 --- a/src/libraries/Microsoft.PowerFx.Core/Texl/Intellisense/SuggestionHandlers/DottedNameNodeSuggestionHandler.cs +++ b/src/libraries/Microsoft.PowerFx.Core/Texl/Intellisense/SuggestionHandlers/DottedNameNodeSuggestionHandler.cs @@ -6,13 +6,12 @@ using Microsoft.PowerFx.Core.Binding; using Microsoft.PowerFx.Core.Binding.BindInfo; using Microsoft.PowerFx.Core.Functions; -using Microsoft.PowerFx.Core.Syntax; -using Microsoft.PowerFx.Core.Syntax.Nodes; using Microsoft.PowerFx.Core.Types; using Microsoft.PowerFx.Core.Types.Enums; using Microsoft.PowerFx.Core.Utils; +using Microsoft.PowerFx.Syntax; -namespace Microsoft.PowerFx.Core.Texl.Intellisense +namespace Microsoft.PowerFx.Intellisense { internal partial class Intellisense { @@ -205,4 +204,4 @@ internal static void AddSuggestionsForDottedName(IntellisenseData.IntellisenseDa } } } -} \ No newline at end of file +} diff --git a/src/libraries/Microsoft.PowerFx.Core/Texl/Intellisense/SuggestionHandlers/ErrorNodeSuggestionHandler.cs b/src/libraries/Microsoft.PowerFx.Core/Texl/Intellisense/SuggestionHandlers/ErrorNodeSuggestionHandler.cs index 22776030d0..7487b7a90f 100644 --- a/src/libraries/Microsoft.PowerFx.Core/Texl/Intellisense/SuggestionHandlers/ErrorNodeSuggestionHandler.cs +++ b/src/libraries/Microsoft.PowerFx.Core/Texl/Intellisense/SuggestionHandlers/ErrorNodeSuggestionHandler.cs @@ -1,9 +1,9 @@ // Copyright (c) Microsoft Corporation. // Licensed under the MIT license. -using Microsoft.PowerFx.Core.Syntax; +using Microsoft.PowerFx.Syntax; -namespace Microsoft.PowerFx.Core.Texl.Intellisense +namespace Microsoft.PowerFx.Intellisense { internal partial class Intellisense { @@ -15,4 +15,4 @@ public ErrorNodeSuggestionHandler() } } } -} \ No newline at end of file +} diff --git a/src/libraries/Microsoft.PowerFx.Core/Texl/Intellisense/SuggestionHandlers/ErrorNodeSuggestionHandlerBase.cs b/src/libraries/Microsoft.PowerFx.Core/Texl/Intellisense/SuggestionHandlers/ErrorNodeSuggestionHandlerBase.cs index 67b5e66a80..3b63583eed 100644 --- a/src/libraries/Microsoft.PowerFx.Core/Texl/Intellisense/SuggestionHandlers/ErrorNodeSuggestionHandlerBase.cs +++ b/src/libraries/Microsoft.PowerFx.Core/Texl/Intellisense/SuggestionHandlers/ErrorNodeSuggestionHandlerBase.cs @@ -1,11 +1,10 @@ // Copyright (c) Microsoft Corporation. // Licensed under the MIT license. -using Microsoft.PowerFx.Core.Syntax; -using Microsoft.PowerFx.Core.Syntax.Nodes; using Microsoft.PowerFx.Core.Utils; +using Microsoft.PowerFx.Syntax; -namespace Microsoft.PowerFx.Core.Texl.Intellisense +namespace Microsoft.PowerFx.Intellisense { internal partial class Intellisense { @@ -42,4 +41,4 @@ internal override bool TryAddSuggestionsForNodeKind(IntellisenseData.Intellisens } } } -} \ No newline at end of file +} diff --git a/src/libraries/Microsoft.PowerFx.Core/Texl/Intellisense/SuggestionHandlers/FirstNameNodeSuggestionHandler.cs b/src/libraries/Microsoft.PowerFx.Core/Texl/Intellisense/SuggestionHandlers/FirstNameNodeSuggestionHandler.cs index 9267a83e8b..364f07f573 100644 --- a/src/libraries/Microsoft.PowerFx.Core/Texl/Intellisense/SuggestionHandlers/FirstNameNodeSuggestionHandler.cs +++ b/src/libraries/Microsoft.PowerFx.Core/Texl/Intellisense/SuggestionHandlers/FirstNameNodeSuggestionHandler.cs @@ -3,14 +3,11 @@ using System.Collections.Generic; using System.Linq; -using Microsoft.PowerFx.Core.Lexer; -using Microsoft.PowerFx.Core.Lexer.Tokens; -using Microsoft.PowerFx.Core.Syntax; -using Microsoft.PowerFx.Core.Syntax.Nodes; using Microsoft.PowerFx.Core.Types; using Microsoft.PowerFx.Core.Utils; +using Microsoft.PowerFx.Syntax; -namespace Microsoft.PowerFx.Core.Texl.Intellisense +namespace Microsoft.PowerFx.Intellisense { internal partial class Intellisense { @@ -141,4 +138,4 @@ private static void AddSuggestionsForScopeFields(IntellisenseData.IntellisenseDa } } } -} \ No newline at end of file +} diff --git a/src/libraries/Microsoft.PowerFx.Core/Texl/Intellisense/SuggestionHandlers/FunctionRecordNameSuggestionHandler.cs b/src/libraries/Microsoft.PowerFx.Core/Texl/Intellisense/SuggestionHandlers/FunctionRecordNameSuggestionHandler.cs index 56de1dc444..f803c1bed2 100644 --- a/src/libraries/Microsoft.PowerFx.Core/Texl/Intellisense/SuggestionHandlers/FunctionRecordNameSuggestionHandler.cs +++ b/src/libraries/Microsoft.PowerFx.Core/Texl/Intellisense/SuggestionHandlers/FunctionRecordNameSuggestionHandler.cs @@ -3,13 +3,11 @@ using Microsoft.PowerFx.Core.Binding.BindInfo; using Microsoft.PowerFx.Core.Functions; -using Microsoft.PowerFx.Core.Lexer; -using Microsoft.PowerFx.Core.Syntax; -using Microsoft.PowerFx.Core.Syntax.Nodes; using Microsoft.PowerFx.Core.Types; using Microsoft.PowerFx.Core.Utils; +using Microsoft.PowerFx.Syntax; -namespace Microsoft.PowerFx.Core.Texl.Intellisense +namespace Microsoft.PowerFx.Intellisense { internal partial class Intellisense { diff --git a/src/libraries/Microsoft.PowerFx.Core/Texl/Intellisense/SuggestionHandlers/ISuggestionHandler.cs b/src/libraries/Microsoft.PowerFx.Core/Texl/Intellisense/SuggestionHandlers/ISuggestionHandler.cs index cd5b82e63d..a27ef38c2d 100644 --- a/src/libraries/Microsoft.PowerFx.Core/Texl/Intellisense/SuggestionHandlers/ISuggestionHandler.cs +++ b/src/libraries/Microsoft.PowerFx.Core/Texl/Intellisense/SuggestionHandlers/ISuggestionHandler.cs @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. // Licensed under the MIT license. -namespace Microsoft.PowerFx.Core.Texl.Intellisense +namespace Microsoft.PowerFx.Intellisense { internal interface ISuggestionHandler { diff --git a/src/libraries/Microsoft.PowerFx.Core/Texl/Intellisense/SuggestionHandlers/NodeKindSuggestionHandler.cs b/src/libraries/Microsoft.PowerFx.Core/Texl/Intellisense/SuggestionHandlers/NodeKindSuggestionHandler.cs index 0ee6df0b6a..4f7c522d9f 100644 --- a/src/libraries/Microsoft.PowerFx.Core/Texl/Intellisense/SuggestionHandlers/NodeKindSuggestionHandler.cs +++ b/src/libraries/Microsoft.PowerFx.Core/Texl/Intellisense/SuggestionHandlers/NodeKindSuggestionHandler.cs @@ -1,10 +1,10 @@ // Copyright (c) Microsoft Corporation. // Licensed under the MIT license. -using Microsoft.PowerFx.Core.Syntax; using Microsoft.PowerFx.Core.Utils; +using Microsoft.PowerFx.Syntax; -namespace Microsoft.PowerFx.Core.Texl.Intellisense +namespace Microsoft.PowerFx.Intellisense { internal partial class Intellisense { diff --git a/src/libraries/Microsoft.PowerFx.Core/Texl/Intellisense/SuggestionHandlers/NullNodeSuggestionHandler.cs b/src/libraries/Microsoft.PowerFx.Core/Texl/Intellisense/SuggestionHandlers/NullNodeSuggestionHandler.cs index 7391bb5653..bbca03b5f5 100644 --- a/src/libraries/Microsoft.PowerFx.Core/Texl/Intellisense/SuggestionHandlers/NullNodeSuggestionHandler.cs +++ b/src/libraries/Microsoft.PowerFx.Core/Texl/Intellisense/SuggestionHandlers/NullNodeSuggestionHandler.cs @@ -3,7 +3,7 @@ using Microsoft.PowerFx.Core.Utils; -namespace Microsoft.PowerFx.Core.Texl.Intellisense +namespace Microsoft.PowerFx.Intellisense { internal partial class Intellisense { diff --git a/src/libraries/Microsoft.PowerFx.Core/Texl/Intellisense/SuggestionHandlers/RecordNodeSuggestionHandler.cs b/src/libraries/Microsoft.PowerFx.Core/Texl/Intellisense/SuggestionHandlers/RecordNodeSuggestionHandler.cs index a5e3716976..7c615686f8 100644 --- a/src/libraries/Microsoft.PowerFx.Core/Texl/Intellisense/SuggestionHandlers/RecordNodeSuggestionHandler.cs +++ b/src/libraries/Microsoft.PowerFx.Core/Texl/Intellisense/SuggestionHandlers/RecordNodeSuggestionHandler.cs @@ -1,12 +1,11 @@ // Copyright (c) Microsoft Corporation. // Licensed under the MIT license. -using Microsoft.PowerFx.Core.Syntax; -using Microsoft.PowerFx.Core.Syntax.Nodes; using Microsoft.PowerFx.Core.Types; using Microsoft.PowerFx.Core.Utils; +using Microsoft.PowerFx.Syntax; -namespace Microsoft.PowerFx.Core.Texl.Intellisense +namespace Microsoft.PowerFx.Intellisense { internal partial class Intellisense { @@ -46,4 +45,4 @@ internal override bool TryAddSuggestionsForNodeKind(IntellisenseData.Intellisens } } } -} \ No newline at end of file +} diff --git a/src/libraries/Microsoft.PowerFx.Core/Texl/Intellisense/SuggestionHandlers/StrInterpSuggestionHandler.cs b/src/libraries/Microsoft.PowerFx.Core/Texl/Intellisense/SuggestionHandlers/StrInterpSuggestionHandler.cs index f90c543c91..8a7d5acf90 100644 --- a/src/libraries/Microsoft.PowerFx.Core/Texl/Intellisense/SuggestionHandlers/StrInterpSuggestionHandler.cs +++ b/src/libraries/Microsoft.PowerFx.Core/Texl/Intellisense/SuggestionHandlers/StrInterpSuggestionHandler.cs @@ -1,12 +1,10 @@ // Copyright (c) Microsoft Corporation. // Licensed under the MIT license. -using Microsoft.PowerFx.Core.Syntax; -using Microsoft.PowerFx.Core.Syntax.Nodes; -using Microsoft.PowerFx.Core.Types; using Microsoft.PowerFx.Core.Utils; +using Microsoft.PowerFx.Syntax; -namespace Microsoft.PowerFx.Core.Texl.Intellisense +namespace Microsoft.PowerFx.Intellisense { internal partial class Intellisense { diff --git a/src/libraries/Microsoft.PowerFx.Core/Texl/Intellisense/SuggestionHandlers/StrNumLitNodeSuggestionHandler.cs b/src/libraries/Microsoft.PowerFx.Core/Texl/Intellisense/SuggestionHandlers/StrNumLitNodeSuggestionHandler.cs index af08cddb1e..9812fcf4d7 100644 --- a/src/libraries/Microsoft.PowerFx.Core/Texl/Intellisense/SuggestionHandlers/StrNumLitNodeSuggestionHandler.cs +++ b/src/libraries/Microsoft.PowerFx.Core/Texl/Intellisense/SuggestionHandlers/StrNumLitNodeSuggestionHandler.cs @@ -1,12 +1,11 @@ // Copyright (c) Microsoft Corporation. // Licensed under the MIT license. -using Microsoft.PowerFx.Core.Syntax; -using Microsoft.PowerFx.Core.Syntax.Nodes; using Microsoft.PowerFx.Core.Types; using Microsoft.PowerFx.Core.Utils; +using Microsoft.PowerFx.Syntax; -namespace Microsoft.PowerFx.Core.Texl.Intellisense +namespace Microsoft.PowerFx.Intellisense { internal partial class Intellisense { @@ -54,4 +53,4 @@ public bool Run(IntellisenseData.IntellisenseData intellisenseData) } } } -} \ No newline at end of file +} diff --git a/src/libraries/Microsoft.PowerFx.Core/Texl/Intellisense/SuggestionHandlers/TableNodeSuggestionHandler.cs b/src/libraries/Microsoft.PowerFx.Core/Texl/Intellisense/SuggestionHandlers/TableNodeSuggestionHandler.cs index caeb9cb889..2d91c1eb38 100644 --- a/src/libraries/Microsoft.PowerFx.Core/Texl/Intellisense/SuggestionHandlers/TableNodeSuggestionHandler.cs +++ b/src/libraries/Microsoft.PowerFx.Core/Texl/Intellisense/SuggestionHandlers/TableNodeSuggestionHandler.cs @@ -1,12 +1,11 @@ // Copyright (c) Microsoft Corporation. // Licensed under the MIT license. -using Microsoft.PowerFx.Core.Syntax; -using Microsoft.PowerFx.Core.Syntax.Nodes; using Microsoft.PowerFx.Core.Types; using Microsoft.PowerFx.Core.Utils; +using Microsoft.PowerFx.Syntax; -namespace Microsoft.PowerFx.Core.Texl.Intellisense +namespace Microsoft.PowerFx.Intellisense { internal partial class Intellisense { @@ -43,4 +42,4 @@ internal override bool TryAddSuggestionsForNodeKind(IntellisenseData.Intellisens } } } -} \ No newline at end of file +} diff --git a/src/libraries/Microsoft.PowerFx.Core/Texl/Intellisense/SuggestionHandlers/UnaryOpNodeSuggestionHandler.cs b/src/libraries/Microsoft.PowerFx.Core/Texl/Intellisense/SuggestionHandlers/UnaryOpNodeSuggestionHandler.cs index 8a03e963b0..2b112df7d4 100644 --- a/src/libraries/Microsoft.PowerFx.Core/Texl/Intellisense/SuggestionHandlers/UnaryOpNodeSuggestionHandler.cs +++ b/src/libraries/Microsoft.PowerFx.Core/Texl/Intellisense/SuggestionHandlers/UnaryOpNodeSuggestionHandler.cs @@ -2,11 +2,10 @@ // Licensed under the MIT license. using Microsoft.PowerFx.Core.Parser; -using Microsoft.PowerFx.Core.Syntax; -using Microsoft.PowerFx.Core.Syntax.Nodes; using Microsoft.PowerFx.Core.Utils; +using Microsoft.PowerFx.Syntax; -namespace Microsoft.PowerFx.Core.Texl.Intellisense +namespace Microsoft.PowerFx.Intellisense { internal partial class Intellisense { @@ -48,4 +47,4 @@ internal override bool TryAddSuggestionsForNodeKind(IntellisenseData.Intellisens } } } -} \ No newline at end of file +} diff --git a/src/libraries/Microsoft.PowerFx.Core/Texl/Intellisense/SuggestionIconKind.cs b/src/libraries/Microsoft.PowerFx.Core/Texl/Intellisense/SuggestionIconKind.cs index 267a839710..400a886142 100644 --- a/src/libraries/Microsoft.PowerFx.Core/Texl/Intellisense/SuggestionIconKind.cs +++ b/src/libraries/Microsoft.PowerFx.Core/Texl/Intellisense/SuggestionIconKind.cs @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. // Licensed under the MIT license. -namespace Microsoft.PowerFx.Core.Texl.Intellisense +namespace Microsoft.PowerFx.Intellisense { public enum SuggestionIconKind { diff --git a/src/libraries/Microsoft.PowerFx.Core/Texl/Intellisense/SuggestionKind.cs b/src/libraries/Microsoft.PowerFx.Core/Texl/Intellisense/SuggestionKind.cs index 35ed98dea1..dea057d9fb 100644 --- a/src/libraries/Microsoft.PowerFx.Core/Texl/Intellisense/SuggestionKind.cs +++ b/src/libraries/Microsoft.PowerFx.Core/Texl/Intellisense/SuggestionKind.cs @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. // Licensed under the MIT license. -namespace Microsoft.PowerFx.Core.Texl.Intellisense +namespace Microsoft.PowerFx.Intellisense { /// /// The kind of a suggestion. diff --git a/src/libraries/Microsoft.PowerFx.Core/Texl/Intellisense/TokenTextSpan.cs b/src/libraries/Microsoft.PowerFx.Core/Texl/Intellisense/TokenTextSpan.cs index 78adab6eab..34e37beeef 100644 --- a/src/libraries/Microsoft.PowerFx.Core/Texl/Intellisense/TokenTextSpan.cs +++ b/src/libraries/Microsoft.PowerFx.Core/Texl/Intellisense/TokenTextSpan.cs @@ -4,7 +4,7 @@ using System.Collections.Generic; using Microsoft.AppMagic.Transport; -namespace Microsoft.PowerFx.Core.Texl.Intellisense +namespace Microsoft.PowerFx.Intellisense { [TransportType(TransportKind.ByValue)] internal interface ITokenTextSpan diff --git a/src/libraries/Microsoft.PowerFx.Core/Texl/Intellisense/TokenType.cs b/src/libraries/Microsoft.PowerFx.Core/Texl/Intellisense/TokenType.cs index 102bbe2fc1..5aecd73138 100644 --- a/src/libraries/Microsoft.PowerFx.Core/Texl/Intellisense/TokenType.cs +++ b/src/libraries/Microsoft.PowerFx.Core/Texl/Intellisense/TokenType.cs @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. // Licensed under the MIT license. -namespace Microsoft.PowerFx.Core.Texl.Intellisense +namespace Microsoft.PowerFx.Intellisense { // Keep in sync with src/AppMagic/js/AppMagic.WebAuthoring/Constants/Texl.ts internal enum TokenType diff --git a/src/libraries/Microsoft.PowerFx.Core/Texl/Intellisense/TokenizerConstants.cs b/src/libraries/Microsoft.PowerFx.Core/Texl/Intellisense/TokenizerConstants.cs index fb224df0da..e8c5e28458 100644 --- a/src/libraries/Microsoft.PowerFx.Core/Texl/Intellisense/TokenizerConstants.cs +++ b/src/libraries/Microsoft.PowerFx.Core/Texl/Intellisense/TokenizerConstants.cs @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. // Licensed under the MIT license. -namespace Microsoft.PowerFx.Core.Texl.Intellisense +namespace Microsoft.PowerFx.Intellisense { internal static class TokenizerConstants { diff --git a/src/libraries/Microsoft.PowerFx.Core/Texl/Intellisense/UIString.cs b/src/libraries/Microsoft.PowerFx.Core/Texl/Intellisense/UIString.cs index 80280eb547..6089485762 100644 --- a/src/libraries/Microsoft.PowerFx.Core/Texl/Intellisense/UIString.cs +++ b/src/libraries/Microsoft.PowerFx.Core/Texl/Intellisense/UIString.cs @@ -3,7 +3,7 @@ using Microsoft.PowerFx.Core.Utils; -namespace Microsoft.PowerFx.Core.Texl.Intellisense +namespace Microsoft.PowerFx.Intellisense { /// /// Object for the UI display string. diff --git a/src/libraries/Microsoft.PowerFx.Core/Texl/ViewFilterDataSourceVisitor.cs b/src/libraries/Microsoft.PowerFx.Core/Texl/ViewFilterDataSourceVisitor.cs index 82f395510c..848de4c6dc 100644 --- a/src/libraries/Microsoft.PowerFx.Core/Texl/ViewFilterDataSourceVisitor.cs +++ b/src/libraries/Microsoft.PowerFx.Core/Texl/ViewFilterDataSourceVisitor.cs @@ -3,10 +3,9 @@ using Microsoft.PowerFx.Core.Binding; using Microsoft.PowerFx.Core.Entities; -using Microsoft.PowerFx.Core.Syntax.Nodes; -using Microsoft.PowerFx.Core.Syntax.Visitors; using Microsoft.PowerFx.Core.Types; using Microsoft.PowerFx.Core.Utils; +using Microsoft.PowerFx.Syntax; namespace Microsoft.PowerFx.Core.Texl { diff --git a/src/libraries/Microsoft.PowerFx.Core/Texl/ViewFinderVisitor.cs b/src/libraries/Microsoft.PowerFx.Core/Texl/ViewFinderVisitor.cs index 0ce337f3c3..8eb4f172ae 100644 --- a/src/libraries/Microsoft.PowerFx.Core/Texl/ViewFinderVisitor.cs +++ b/src/libraries/Microsoft.PowerFx.Core/Texl/ViewFinderVisitor.cs @@ -2,10 +2,9 @@ // Licensed under the MIT license. using Microsoft.PowerFx.Core.Binding; -using Microsoft.PowerFx.Core.Syntax.Nodes; -using Microsoft.PowerFx.Core.Syntax.Visitors; using Microsoft.PowerFx.Core.Types; using Microsoft.PowerFx.Core.Utils; +using Microsoft.PowerFx.Syntax; namespace Microsoft.PowerFx.Core.Texl { diff --git a/src/libraries/Microsoft.PowerFx.Core/Types/DType.cs b/src/libraries/Microsoft.PowerFx.Core/Types/DType.cs index 1ba0411cba..6d489be594 100644 --- a/src/libraries/Microsoft.PowerFx.Core/Types/DType.cs +++ b/src/libraries/Microsoft.PowerFx.Core/Types/DType.cs @@ -10,11 +10,10 @@ using Microsoft.PowerFx.Core.Entities; using Microsoft.PowerFx.Core.Errors; using Microsoft.PowerFx.Core.Functions.Delegation; -using Microsoft.PowerFx.Core.Lexer; using Microsoft.PowerFx.Core.Localization; -using Microsoft.PowerFx.Core.Syntax.Nodes; using Microsoft.PowerFx.Core.UtilityDataStructures; using Microsoft.PowerFx.Core.Utils; +using Microsoft.PowerFx.Syntax; using Conditional = System.Diagnostics.ConditionalAttribute; namespace Microsoft.PowerFx.Core.Types diff --git a/src/libraries/Microsoft.PowerFx.Core/Types/DTypeSpecParser.cs b/src/libraries/Microsoft.PowerFx.Core/Types/DTypeSpecParser.cs index 723ff389fc..a14f884243 100644 --- a/src/libraries/Microsoft.PowerFx.Core/Types/DTypeSpecParser.cs +++ b/src/libraries/Microsoft.PowerFx.Core/Types/DTypeSpecParser.cs @@ -3,8 +3,8 @@ using System.Globalization; using System.Linq; -using Microsoft.PowerFx.Core.Lexer; using Microsoft.PowerFx.Core.Utils; +using Microsoft.PowerFx.Syntax; namespace Microsoft.PowerFx.Core.Types { diff --git a/src/libraries/Microsoft.PowerFx.Core/Utils/DPath.cs b/src/libraries/Microsoft.PowerFx.Core/Utils/DPath.cs index 39faf4e34c..cec501ec5d 100644 --- a/src/libraries/Microsoft.PowerFx.Core/Utils/DPath.cs +++ b/src/libraries/Microsoft.PowerFx.Core/Utils/DPath.cs @@ -6,7 +6,7 @@ using System.Linq; using System.Text; using System.Threading; -using Microsoft.PowerFx.Core.Lexer; +using Microsoft.PowerFx.Syntax; using Conditional = System.Diagnostics.ConditionalAttribute; namespace Microsoft.PowerFx.Core.Utils diff --git a/src/libraries/Microsoft.PowerFx.Core/Utils/GetTokensUtils.cs b/src/libraries/Microsoft.PowerFx.Core/Utils/GetTokensUtils.cs index 6b933d19eb..d929c1d756 100644 --- a/src/libraries/Microsoft.PowerFx.Core/Utils/GetTokensUtils.cs +++ b/src/libraries/Microsoft.PowerFx.Core/Utils/GetTokensUtils.cs @@ -4,6 +4,7 @@ using System.Collections.Generic; using Microsoft.PowerFx.Core.Binding; using Microsoft.PowerFx.Core.Public; +using Microsoft.PowerFx.Intellisense; namespace Microsoft.PowerFx.Core.Utils { diff --git a/src/libraries/Microsoft.PowerFx.Interpreter/Environment/OptionSet.cs b/src/libraries/Microsoft.PowerFx.Interpreter/Environment/OptionSet.cs index 52798c7214..896943975d 100644 --- a/src/libraries/Microsoft.PowerFx.Interpreter/Environment/OptionSet.cs +++ b/src/libraries/Microsoft.PowerFx.Interpreter/Environment/OptionSet.cs @@ -11,11 +11,10 @@ using Microsoft.PowerFx.Core.Entities; using Microsoft.PowerFx.Core.Errors; using Microsoft.PowerFx.Core.IR; -using Microsoft.PowerFx.Core.Public.Types; -using Microsoft.PowerFx.Core.Public.Values; using Microsoft.PowerFx.Core.Types; using Microsoft.PowerFx.Core.UtilityDataStructures; using Microsoft.PowerFx.Core.Utils; +using Microsoft.PowerFx.Types; namespace Microsoft.PowerFx { diff --git a/src/libraries/Microsoft.PowerFx.Interpreter/EvalVisitor.cs b/src/libraries/Microsoft.PowerFx.Interpreter/EvalVisitor.cs index a887f65793..c3e1d505d8 100644 --- a/src/libraries/Microsoft.PowerFx.Interpreter/EvalVisitor.cs +++ b/src/libraries/Microsoft.PowerFx.Interpreter/EvalVisitor.cs @@ -11,10 +11,8 @@ using Microsoft.PowerFx.Core.IR; using Microsoft.PowerFx.Core.IR.Nodes; using Microsoft.PowerFx.Core.IR.Symbols; -using Microsoft.PowerFx.Core.Public; -using Microsoft.PowerFx.Core.Public.Types; -using Microsoft.PowerFx.Core.Public.Values; using Microsoft.PowerFx.Functions; +using Microsoft.PowerFx.Types; using static Microsoft.PowerFx.Functions.Library; namespace Microsoft.PowerFx diff --git a/src/libraries/Microsoft.PowerFx.Interpreter/Functions/CommonErrors.cs b/src/libraries/Microsoft.PowerFx.Interpreter/Functions/CommonErrors.cs index 2873950bfa..425523f7ae 100644 --- a/src/libraries/Microsoft.PowerFx.Interpreter/Functions/CommonErrors.cs +++ b/src/libraries/Microsoft.PowerFx.Interpreter/Functions/CommonErrors.cs @@ -2,8 +2,7 @@ // Licensed under the MIT license. using Microsoft.PowerFx.Core.IR; -using Microsoft.PowerFx.Core.Public; -using Microsoft.PowerFx.Core.Public.Values; +using Microsoft.PowerFx.Types; namespace Microsoft.PowerFx.Functions { diff --git a/src/libraries/Microsoft.PowerFx.Interpreter/Functions/Library.cs b/src/libraries/Microsoft.PowerFx.Interpreter/Functions/Library.cs index b0c052ec71..493d3837e2 100644 --- a/src/libraries/Microsoft.PowerFx.Interpreter/Functions/Library.cs +++ b/src/libraries/Microsoft.PowerFx.Interpreter/Functions/Library.cs @@ -7,12 +7,10 @@ using System.Threading.Tasks; using Microsoft.PowerFx.Core.Functions; using Microsoft.PowerFx.Core.IR; -using Microsoft.PowerFx.Core.Public; -using Microsoft.PowerFx.Core.Public.Types; -using Microsoft.PowerFx.Core.Public.Values; using Microsoft.PowerFx.Core.Texl; using Microsoft.PowerFx.Core.Types; using Microsoft.PowerFx.Core.Utils; +using Microsoft.PowerFx.Types; namespace Microsoft.PowerFx.Functions { diff --git a/src/libraries/Microsoft.PowerFx.Interpreter/Functions/LibraryDate.cs b/src/libraries/Microsoft.PowerFx.Interpreter/Functions/LibraryDate.cs index b4dac9b5fb..1ce7fbe3fc 100644 --- a/src/libraries/Microsoft.PowerFx.Interpreter/Functions/LibraryDate.cs +++ b/src/libraries/Microsoft.PowerFx.Interpreter/Functions/LibraryDate.cs @@ -5,7 +5,7 @@ using System.Globalization; using System.Threading.Tasks; using Microsoft.PowerFx.Core.IR; -using Microsoft.PowerFx.Core.Public.Values; +using Microsoft.PowerFx.Types; namespace Microsoft.PowerFx.Functions { @@ -370,13 +370,13 @@ public static FormulaValue DateTimeFunction(IRContext irContext, NumberValue[] a var year = (int)args[0].Value; var month = (int)args[1].Value; var day = (int)args[2].Value; - var date = DateImpl(IRContext.NotInSource(Core.Public.Types.FormulaType.Date), year, month, day); + var date = DateImpl(IRContext.NotInSource(FormulaType.Date), year, month, day); var hour = (int)args[3].Value; var minute = (int)args[4].Value; var second = (int)args[5].Value; var millisecond = (int)args[6].Value; - var time = TimeImpl(IRContext.NotInSource(Core.Public.Types.FormulaType.Time), hour, minute, second, millisecond); + var time = TimeImpl(IRContext.NotInSource(FormulaType.Time), hour, minute, second, millisecond); var result = AddDateAndTime(irContext, new[] { date, time }); diff --git a/src/libraries/Microsoft.PowerFx.Interpreter/Functions/LibraryJson.cs b/src/libraries/Microsoft.PowerFx.Interpreter/Functions/LibraryJson.cs index 30442b9cff..6e1158eb6a 100644 --- a/src/libraries/Microsoft.PowerFx.Interpreter/Functions/LibraryJson.cs +++ b/src/libraries/Microsoft.PowerFx.Interpreter/Functions/LibraryJson.cs @@ -5,9 +5,7 @@ using System.Text.Json; using Microsoft.PowerFx.Core.Functions; using Microsoft.PowerFx.Core.IR; -using Microsoft.PowerFx.Core.Public; -using Microsoft.PowerFx.Core.Public.Types; -using Microsoft.PowerFx.Core.Public.Values; +using Microsoft.PowerFx.Types; namespace Microsoft.PowerFx.Functions { diff --git a/src/libraries/Microsoft.PowerFx.Interpreter/Functions/LibraryLogical.cs b/src/libraries/Microsoft.PowerFx.Interpreter/Functions/LibraryLogical.cs index 9bb89e1415..dc4ef18317 100644 --- a/src/libraries/Microsoft.PowerFx.Interpreter/Functions/LibraryLogical.cs +++ b/src/libraries/Microsoft.PowerFx.Interpreter/Functions/LibraryLogical.cs @@ -3,7 +3,7 @@ using System.Threading.Tasks; using Microsoft.PowerFx.Core.IR; -using Microsoft.PowerFx.Core.Public.Values; +using Microsoft.PowerFx.Types; namespace Microsoft.PowerFx.Functions { diff --git a/src/libraries/Microsoft.PowerFx.Interpreter/Functions/LibraryMath.cs b/src/libraries/Microsoft.PowerFx.Interpreter/Functions/LibraryMath.cs index c650fb3b75..060536a90a 100644 --- a/src/libraries/Microsoft.PowerFx.Interpreter/Functions/LibraryMath.cs +++ b/src/libraries/Microsoft.PowerFx.Interpreter/Functions/LibraryMath.cs @@ -6,9 +6,7 @@ using System.Linq; using System.Threading.Tasks; using Microsoft.PowerFx.Core.IR; -using Microsoft.PowerFx.Core.Public; -using Microsoft.PowerFx.Core.Public.Types; -using Microsoft.PowerFx.Core.Public.Values; +using Microsoft.PowerFx.Types; namespace Microsoft.PowerFx.Functions { diff --git a/src/libraries/Microsoft.PowerFx.Interpreter/Functions/LibraryOperators.cs b/src/libraries/Microsoft.PowerFx.Interpreter/Functions/LibraryOperators.cs index 53d44580ef..227950be23 100644 --- a/src/libraries/Microsoft.PowerFx.Interpreter/Functions/LibraryOperators.cs +++ b/src/libraries/Microsoft.PowerFx.Interpreter/Functions/LibraryOperators.cs @@ -4,8 +4,7 @@ using System; using System.Linq; using Microsoft.PowerFx.Core.IR; -using Microsoft.PowerFx.Core.Public.Types; -using Microsoft.PowerFx.Core.Public.Values; +using Microsoft.PowerFx.Types; namespace Microsoft.PowerFx.Functions { diff --git a/src/libraries/Microsoft.PowerFx.Interpreter/Functions/LibraryTable.cs b/src/libraries/Microsoft.PowerFx.Interpreter/Functions/LibraryTable.cs index 5cf3b4a233..b8608507f8 100644 --- a/src/libraries/Microsoft.PowerFx.Interpreter/Functions/LibraryTable.cs +++ b/src/libraries/Microsoft.PowerFx.Interpreter/Functions/LibraryTable.cs @@ -7,9 +7,7 @@ using System.Threading; using System.Threading.Tasks; using Microsoft.PowerFx.Core.IR; -using Microsoft.PowerFx.Core.Public; -using Microsoft.PowerFx.Core.Public.Types; -using Microsoft.PowerFx.Core.Public.Values; +using Microsoft.PowerFx.Types; namespace Microsoft.PowerFx.Functions { diff --git a/src/libraries/Microsoft.PowerFx.Interpreter/Functions/LibraryText.cs b/src/libraries/Microsoft.PowerFx.Interpreter/Functions/LibraryText.cs index 7b4248d56b..a916479d4c 100644 --- a/src/libraries/Microsoft.PowerFx.Interpreter/Functions/LibraryText.cs +++ b/src/libraries/Microsoft.PowerFx.Interpreter/Functions/LibraryText.cs @@ -10,8 +10,7 @@ using System.Threading.Tasks; using Microsoft.PowerFx.Core.Functions; using Microsoft.PowerFx.Core.IR; -using Microsoft.PowerFx.Core.Public.Types; -using Microsoft.PowerFx.Core.Public.Values; +using Microsoft.PowerFx.Types; namespace Microsoft.PowerFx.Functions { diff --git a/src/libraries/Microsoft.PowerFx.Interpreter/Functions/LibraryUnary.cs b/src/libraries/Microsoft.PowerFx.Interpreter/Functions/LibraryUnary.cs index 3efbf8bea2..67275ac36f 100644 --- a/src/libraries/Microsoft.PowerFx.Interpreter/Functions/LibraryUnary.cs +++ b/src/libraries/Microsoft.PowerFx.Interpreter/Functions/LibraryUnary.cs @@ -6,8 +6,7 @@ using System.Threading.Tasks; using Microsoft.PowerFx.Core.IR; using Microsoft.PowerFx.Core.IR.Nodes; -using Microsoft.PowerFx.Core.Public.Values; -using Microsoft.PowerFx.Core.Utils; +using Microsoft.PowerFx.Types; namespace Microsoft.PowerFx.Functions { diff --git a/src/libraries/Microsoft.PowerFx.Interpreter/Functions/LibraryUntypedObject.cs b/src/libraries/Microsoft.PowerFx.Interpreter/Functions/LibraryUntypedObject.cs index 54e4e70ad7..790e790345 100644 --- a/src/libraries/Microsoft.PowerFx.Interpreter/Functions/LibraryUntypedObject.cs +++ b/src/libraries/Microsoft.PowerFx.Interpreter/Functions/LibraryUntypedObject.cs @@ -5,9 +5,7 @@ using System.Text.Json; using Microsoft.PowerFx.Core.Functions; using Microsoft.PowerFx.Core.IR; -using Microsoft.PowerFx.Core.Public; -using Microsoft.PowerFx.Core.Public.Types; -using Microsoft.PowerFx.Core.Public.Values; +using Microsoft.PowerFx.Types; namespace Microsoft.PowerFx.Functions { diff --git a/src/libraries/Microsoft.PowerFx.Interpreter/Functions/ResolvedObjectHelpers.cs b/src/libraries/Microsoft.PowerFx.Interpreter/Functions/ResolvedObjectHelpers.cs index 554862b9ff..3c4b85c1a5 100644 --- a/src/libraries/Microsoft.PowerFx.Interpreter/Functions/ResolvedObjectHelpers.cs +++ b/src/libraries/Microsoft.PowerFx.Interpreter/Functions/ResolvedObjectHelpers.cs @@ -6,10 +6,7 @@ using Microsoft.PowerFx.Core.Entities; using Microsoft.PowerFx.Core.IR; using Microsoft.PowerFx.Core.IR.Nodes; -using Microsoft.PowerFx.Core.Public; -using Microsoft.PowerFx.Core.Public.Types; -using Microsoft.PowerFx.Core.Public.Values; -using Microsoft.PowerFx.Core.Types; +using Microsoft.PowerFx.Types; namespace Microsoft.PowerFx.Functions { diff --git a/src/libraries/Microsoft.PowerFx.Interpreter/Functions/RuntimeHelpers.cs b/src/libraries/Microsoft.PowerFx.Interpreter/Functions/RuntimeHelpers.cs index 4240f5b1b2..8c3ecb43b0 100644 --- a/src/libraries/Microsoft.PowerFx.Interpreter/Functions/RuntimeHelpers.cs +++ b/src/libraries/Microsoft.PowerFx.Interpreter/Functions/RuntimeHelpers.cs @@ -2,7 +2,7 @@ // Licensed under the MIT license. using Microsoft.PowerFx.Core.IR; -using Microsoft.PowerFx.Core.Public.Values; +using Microsoft.PowerFx.Types; namespace Microsoft.PowerFx.Functions { diff --git a/src/libraries/Microsoft.PowerFx.Interpreter/Functions/StandardErrorHandling.cs b/src/libraries/Microsoft.PowerFx.Interpreter/Functions/StandardErrorHandling.cs index a5b2a4661d..b48775d795 100644 --- a/src/libraries/Microsoft.PowerFx.Interpreter/Functions/StandardErrorHandling.cs +++ b/src/libraries/Microsoft.PowerFx.Interpreter/Functions/StandardErrorHandling.cs @@ -7,9 +7,7 @@ using System.Threading.Tasks; using Microsoft.PowerFx.Core.Functions; using Microsoft.PowerFx.Core.IR; -using Microsoft.PowerFx.Core.Public; -using Microsoft.PowerFx.Core.Public.Types; -using Microsoft.PowerFx.Core.Public.Values; +using Microsoft.PowerFx.Types; namespace Microsoft.PowerFx.Functions { diff --git a/src/libraries/Microsoft.PowerFx.Interpreter/IScope.cs b/src/libraries/Microsoft.PowerFx.Interpreter/IScope.cs index 7637b79e49..c7bba7dcc2 100644 --- a/src/libraries/Microsoft.PowerFx.Interpreter/IScope.cs +++ b/src/libraries/Microsoft.PowerFx.Interpreter/IScope.cs @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. // Licensed under the MIT license. -using Microsoft.PowerFx.Core.Public.Values; +using Microsoft.PowerFx.Types; namespace Microsoft.PowerFx { diff --git a/src/libraries/Microsoft.PowerFx.Interpreter/Marshal/ITypeMarshallerProvider.cs b/src/libraries/Microsoft.PowerFx.Interpreter/Marshal/ITypeMarshallerProvider.cs index 53542ef66e..611a4da44b 100644 --- a/src/libraries/Microsoft.PowerFx.Interpreter/Marshal/ITypeMarshallerProvider.cs +++ b/src/libraries/Microsoft.PowerFx.Interpreter/Marshal/ITypeMarshallerProvider.cs @@ -2,8 +2,7 @@ // Licensed under the MIT license. using System; -using Microsoft.PowerFx.Core.Public.Types; -using Microsoft.PowerFx.Core.Public.Values; +using Microsoft.PowerFx.Types; namespace Microsoft.PowerFx { diff --git a/src/libraries/Microsoft.PowerFx.Interpreter/Marshal/ObjectMarshaller.cs b/src/libraries/Microsoft.PowerFx.Interpreter/Marshal/ObjectMarshaller.cs index 9e7e413c7f..5c5de2dad1 100644 --- a/src/libraries/Microsoft.PowerFx.Interpreter/Marshal/ObjectMarshaller.cs +++ b/src/libraries/Microsoft.PowerFx.Interpreter/Marshal/ObjectMarshaller.cs @@ -4,9 +4,7 @@ using System; using System.Collections.Generic; using System.Diagnostics; -using Microsoft.PowerFx.Core.IR; -using Microsoft.PowerFx.Core.Public.Types; -using Microsoft.PowerFx.Core.Public.Values; +using Microsoft.PowerFx.Types; namespace Microsoft.PowerFx { diff --git a/src/libraries/Microsoft.PowerFx.Interpreter/Marshal/ObjectMarshallerProvider.cs b/src/libraries/Microsoft.PowerFx.Interpreter/Marshal/ObjectMarshallerProvider.cs index 6781f9364d..497ba237f3 100644 --- a/src/libraries/Microsoft.PowerFx.Interpreter/Marshal/ObjectMarshallerProvider.cs +++ b/src/libraries/Microsoft.PowerFx.Interpreter/Marshal/ObjectMarshallerProvider.cs @@ -3,15 +3,8 @@ using System; using System.Collections.Generic; -using System.Diagnostics; -using System.Diagnostics.Contracts; using System.Reflection; -using System.Text; -using System.Text.Json; -using Microsoft.PowerFx.Core; -using Microsoft.PowerFx.Core.IR; -using Microsoft.PowerFx.Core.Public.Types; -using Microsoft.PowerFx.Core.Public.Values; +using Microsoft.PowerFx.Types; namespace Microsoft.PowerFx { diff --git a/src/libraries/Microsoft.PowerFx.Interpreter/Marshal/PrimitiveMarshallerProvider.cs b/src/libraries/Microsoft.PowerFx.Interpreter/Marshal/PrimitiveMarshallerProvider.cs index 1112332524..fe29bf7ec4 100644 --- a/src/libraries/Microsoft.PowerFx.Interpreter/Marshal/PrimitiveMarshallerProvider.cs +++ b/src/libraries/Microsoft.PowerFx.Interpreter/Marshal/PrimitiveMarshallerProvider.cs @@ -5,8 +5,7 @@ using System.Collections.Generic; using System.Diagnostics; using Microsoft.PowerFx.Core; -using Microsoft.PowerFx.Core.Public.Types; -using Microsoft.PowerFx.Core.Public.Values; +using Microsoft.PowerFx.Types; namespace Microsoft.PowerFx { diff --git a/src/libraries/Microsoft.PowerFx.Interpreter/Marshal/PrimitiveTypeMarshaler.cs b/src/libraries/Microsoft.PowerFx.Interpreter/Marshal/PrimitiveTypeMarshaler.cs index a067dfc936..b95e67d8f5 100644 --- a/src/libraries/Microsoft.PowerFx.Interpreter/Marshal/PrimitiveTypeMarshaler.cs +++ b/src/libraries/Microsoft.PowerFx.Interpreter/Marshal/PrimitiveTypeMarshaler.cs @@ -4,8 +4,7 @@ using System; using System.Collections.Generic; using System.Diagnostics; -using Microsoft.PowerFx.Core.Public.Types; -using Microsoft.PowerFx.Core.Public.Values; +using Microsoft.PowerFx.Types; namespace Microsoft.PowerFx { diff --git a/src/libraries/Microsoft.PowerFx.Interpreter/Marshal/TableMarshallerProvider.cs b/src/libraries/Microsoft.PowerFx.Interpreter/Marshal/TableMarshallerProvider.cs index 76c9413e1a..6469c084db 100644 --- a/src/libraries/Microsoft.PowerFx.Interpreter/Marshal/TableMarshallerProvider.cs +++ b/src/libraries/Microsoft.PowerFx.Interpreter/Marshal/TableMarshallerProvider.cs @@ -2,21 +2,13 @@ // Licensed under the MIT license. using System; -using System.Collections; using System.Collections.Generic; using System.Diagnostics; -using System.Diagnostics.Contracts; -using System.Linq; -using System.Reflection; -using System.Text; -using System.Text.Json; -using Microsoft.PowerFx.Core; using Microsoft.PowerFx.Core.IR; -using Microsoft.PowerFx.Core.Public.Types; -using Microsoft.PowerFx.Core.Public.Values; +using Microsoft.PowerFx.Types; namespace Microsoft.PowerFx -{ +{ /// /// Marshal .Net classes (with fields). This supports strong typing and lazy marshalling. /// Handles any IEnumerable (including arrays). diff --git a/src/libraries/Microsoft.PowerFx.Interpreter/Marshal/TypeMarshallerCache.cs b/src/libraries/Microsoft.PowerFx.Interpreter/Marshal/TypeMarshallerCache.cs index 4676990477..76f872d3a0 100644 --- a/src/libraries/Microsoft.PowerFx.Interpreter/Marshal/TypeMarshallerCache.cs +++ b/src/libraries/Microsoft.PowerFx.Interpreter/Marshal/TypeMarshallerCache.cs @@ -6,12 +6,7 @@ using System.Diagnostics; using System.Diagnostics.Contracts; using System.Linq; -using System.Reflection; -using System.Text; -using System.Text.Json; -using Microsoft.PowerFx.Core.IR; -using Microsoft.PowerFx.Core.Public.Types; -using Microsoft.PowerFx.Core.Public.Values; +using Microsoft.PowerFx.Types; namespace Microsoft.PowerFx { diff --git a/src/libraries/Microsoft.PowerFx.Interpreter/Marshal/TypeMarshallerCacheExtensions.cs b/src/libraries/Microsoft.PowerFx.Interpreter/Marshal/TypeMarshallerCacheExtensions.cs index 620656aa29..c18f65258f 100644 --- a/src/libraries/Microsoft.PowerFx.Interpreter/Marshal/TypeMarshallerCacheExtensions.cs +++ b/src/libraries/Microsoft.PowerFx.Interpreter/Marshal/TypeMarshallerCacheExtensions.cs @@ -3,15 +3,8 @@ using System; using System.Collections.Generic; -using System.Diagnostics; -using System.Diagnostics.Contracts; using System.Linq; -using System.Reflection; -using System.Text; -using System.Text.Json; -using Microsoft.PowerFx.Core.IR; -using Microsoft.PowerFx.Core.Public.Types; -using Microsoft.PowerFx.Core.Public.Values; +using Microsoft.PowerFx.Types; namespace Microsoft.PowerFx { diff --git a/src/libraries/Microsoft.PowerFx.Interpreter/ParsedExpression.cs b/src/libraries/Microsoft.PowerFx.Interpreter/ParsedExpression.cs index 9f09496fbc..9e8d890c68 100644 --- a/src/libraries/Microsoft.PowerFx.Interpreter/ParsedExpression.cs +++ b/src/libraries/Microsoft.PowerFx.Interpreter/ParsedExpression.cs @@ -6,8 +6,7 @@ using System.Threading.Tasks; using Microsoft.PowerFx.Core.IR.Nodes; using Microsoft.PowerFx.Core.IR.Symbols; -using Microsoft.PowerFx.Core.Public; -using Microsoft.PowerFx.Core.Public.Values; +using Microsoft.PowerFx.Types; namespace Microsoft.PowerFx { diff --git a/src/libraries/Microsoft.PowerFx.Interpreter/RecalcEngine.cs b/src/libraries/Microsoft.PowerFx.Interpreter/RecalcEngine.cs index bdbebfa328..579f04918c 100644 --- a/src/libraries/Microsoft.PowerFx.Interpreter/RecalcEngine.cs +++ b/src/libraries/Microsoft.PowerFx.Interpreter/RecalcEngine.cs @@ -3,29 +3,13 @@ using System; using System.Collections.Generic; -using System.Collections.Immutable; -using System.Linq; using System.Threading; using System.Threading.Tasks; -using Microsoft.PowerFx.Core; -using Microsoft.PowerFx.Core.Binding; -using Microsoft.PowerFx.Core.Entities; -using Microsoft.PowerFx.Core.Functions; using Microsoft.PowerFx.Core.Glue; using Microsoft.PowerFx.Core.IR; -using Microsoft.PowerFx.Core.IR.Nodes; -using Microsoft.PowerFx.Core.IR.Symbols; -using Microsoft.PowerFx.Core.Lexer; -using Microsoft.PowerFx.Core.Localization; -using Microsoft.PowerFx.Core.Parser; -using Microsoft.PowerFx.Core.Public; -using Microsoft.PowerFx.Core.Public.Types; -using Microsoft.PowerFx.Core.Public.Values; -using Microsoft.PowerFx.Core.Syntax; using Microsoft.PowerFx.Core.Texl; -using Microsoft.PowerFx.Core.Texl.Intellisense; -using Microsoft.PowerFx.Core.Types; using Microsoft.PowerFx.Functions; +using Microsoft.PowerFx.Types; namespace Microsoft.PowerFx { diff --git a/src/libraries/Microsoft.PowerFx.Interpreter/RecalcEngineResolver.cs b/src/libraries/Microsoft.PowerFx.Interpreter/RecalcEngineResolver.cs index 2d37c93924..cc6d9b85e2 100644 --- a/src/libraries/Microsoft.PowerFx.Interpreter/RecalcEngineResolver.cs +++ b/src/libraries/Microsoft.PowerFx.Interpreter/RecalcEngineResolver.cs @@ -1,17 +1,9 @@ // Copyright (c) Microsoft Corporation. // Licensed under the MIT license. -using System; -using System.Collections.Generic; -using System.Linq; -using Microsoft.PowerFx.Core; using Microsoft.PowerFx.Core.Binding; using Microsoft.PowerFx.Core.Binding.BindInfo; -using Microsoft.PowerFx.Core.Entities; -using Microsoft.PowerFx.Core.Functions; using Microsoft.PowerFx.Core.Glue; -using Microsoft.PowerFx.Core.Public.Types; -using Microsoft.PowerFx.Core.Types.Enums; using Microsoft.PowerFx.Core.Utils; namespace Microsoft.PowerFx diff --git a/src/libraries/Microsoft.PowerFx.Interpreter/RecalcEngineScope.cs b/src/libraries/Microsoft.PowerFx.Interpreter/RecalcEngineScope.cs index f01ff55fc0..a4ec831168 100644 --- a/src/libraries/Microsoft.PowerFx.Interpreter/RecalcEngineScope.cs +++ b/src/libraries/Microsoft.PowerFx.Interpreter/RecalcEngineScope.cs @@ -3,10 +3,8 @@ using System; using System.Web; -using Microsoft.PowerFx.Core.Public; -using Microsoft.PowerFx.Core.Public.Types; -using Microsoft.PowerFx.Core.Public.Values; -using Microsoft.PowerFx.Core.Texl.Intellisense; +using Microsoft.PowerFx.Intellisense; +using Microsoft.PowerFx.Types; namespace Microsoft.PowerFx { diff --git a/src/libraries/Microsoft.PowerFx.Interpreter/RecalcEngineWorker.cs b/src/libraries/Microsoft.PowerFx.Interpreter/RecalcEngineWorker.cs index 82782ab917..051919b152 100644 --- a/src/libraries/Microsoft.PowerFx.Interpreter/RecalcEngineWorker.cs +++ b/src/libraries/Microsoft.PowerFx.Interpreter/RecalcEngineWorker.cs @@ -6,11 +6,8 @@ using System.Linq; using System.Threading; using Microsoft.PowerFx.Core.IR; -using Microsoft.PowerFx.Core.IR.Nodes; -using Microsoft.PowerFx.Core.IR.Symbols; -using Microsoft.PowerFx.Core.Localization; -using Microsoft.PowerFx.Core.Public.Values; using Microsoft.PowerFx.Functions; +using Microsoft.PowerFx.Types; namespace Microsoft.PowerFx { diff --git a/src/libraries/Microsoft.PowerFx.Interpreter/RecalcFormulaInfo.cs b/src/libraries/Microsoft.PowerFx.Interpreter/RecalcFormulaInfo.cs index 921c00cc0f..e9fb96290d 100644 --- a/src/libraries/Microsoft.PowerFx.Interpreter/RecalcFormulaInfo.cs +++ b/src/libraries/Microsoft.PowerFx.Interpreter/RecalcFormulaInfo.cs @@ -4,8 +4,7 @@ using System; using System.Collections.Generic; using Microsoft.PowerFx.Core.Binding; -using Microsoft.PowerFx.Core.Public.Types; -using Microsoft.PowerFx.Core.Public.Values; +using Microsoft.PowerFx.Types; namespace Microsoft.PowerFx { diff --git a/src/libraries/Microsoft.PowerFx.Interpreter/ReflectionFunction.cs b/src/libraries/Microsoft.PowerFx.Interpreter/ReflectionFunction.cs index 4605779dd5..6e502687b7 100644 --- a/src/libraries/Microsoft.PowerFx.Interpreter/ReflectionFunction.cs +++ b/src/libraries/Microsoft.PowerFx.Interpreter/ReflectionFunction.cs @@ -9,10 +9,9 @@ using System.Threading.Tasks; using Microsoft.PowerFx.Core.Functions; using Microsoft.PowerFx.Core.Localization; -using Microsoft.PowerFx.Core.Public.Types; -using Microsoft.PowerFx.Core.Public.Values; using Microsoft.PowerFx.Core.Types; using Microsoft.PowerFx.Core.Utils; +using Microsoft.PowerFx.Types; using static Microsoft.PowerFx.Core.Localization.TexlStrings; namespace Microsoft.PowerFx diff --git a/src/libraries/Microsoft.PowerFx.Interpreter/SymbolContext.cs b/src/libraries/Microsoft.PowerFx.Interpreter/SymbolContext.cs index de64906503..3f9aa670a6 100644 --- a/src/libraries/Microsoft.PowerFx.Interpreter/SymbolContext.cs +++ b/src/libraries/Microsoft.PowerFx.Interpreter/SymbolContext.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using Microsoft.PowerFx.Core.IR.Symbols; -using Microsoft.PowerFx.Core.Public.Values; +using Microsoft.PowerFx.Types; namespace Microsoft.PowerFx { diff --git a/src/libraries/Microsoft.PowerFx.Interpreter/Values/LambdaFormulaValue.cs b/src/libraries/Microsoft.PowerFx.Interpreter/Values/LambdaFormulaValue.cs index 038c2f2aff..f69a486c21 100644 --- a/src/libraries/Microsoft.PowerFx.Interpreter/Values/LambdaFormulaValue.cs +++ b/src/libraries/Microsoft.PowerFx.Interpreter/Values/LambdaFormulaValue.cs @@ -6,9 +6,8 @@ using System.Threading.Tasks; using Microsoft.PowerFx.Core.IR; using Microsoft.PowerFx.Core.IR.Nodes; -using Microsoft.PowerFx.Core.Public.Values; -namespace Microsoft.PowerFx +namespace Microsoft.PowerFx.Types { [DebuggerDisplay("{_tree}")] internal class LambdaFormulaValue : FormulaValue diff --git a/src/libraries/Microsoft.PowerFx.Interpreter/Values/ObjectCollectionTableValue.cs b/src/libraries/Microsoft.PowerFx.Interpreter/Values/ObjectCollectionTableValue.cs index 6f48d38cfb..9d0c145c5e 100644 --- a/src/libraries/Microsoft.PowerFx.Interpreter/Values/ObjectCollectionTableValue.cs +++ b/src/libraries/Microsoft.PowerFx.Interpreter/Values/ObjectCollectionTableValue.cs @@ -3,9 +3,8 @@ using System.Collections.Generic; using Microsoft.PowerFx.Core.IR; -using Microsoft.PowerFx.Core.Public.Values; -namespace Microsoft.PowerFx +namespace Microsoft.PowerFx.Types { // Table based on a .net collection class. // T is marhsalled via a ITypeMarshaller. diff --git a/src/libraries/Microsoft.PowerFx.Interpreter/Values/ObjectRecordValue.cs b/src/libraries/Microsoft.PowerFx.Interpreter/Values/ObjectRecordValue.cs index b0fc60a9d8..633e06370b 100644 --- a/src/libraries/Microsoft.PowerFx.Interpreter/Values/ObjectRecordValue.cs +++ b/src/libraries/Microsoft.PowerFx.Interpreter/Values/ObjectRecordValue.cs @@ -1,16 +1,7 @@ // Copyright (c) Microsoft Corporation. // Licensed under the MIT license. -using System; -using System.Collections.Generic; -using System.Diagnostics.Contracts; -using System.Dynamic; -using System.Reflection; -using Microsoft.PowerFx.Core.IR; -using Microsoft.PowerFx.Core.Public.Types; -using Microsoft.PowerFx.Core.Public.Values; - -namespace Microsoft.PowerFx +namespace Microsoft.PowerFx.Types { /// /// Represent a Record that's backed by a DotNet object. diff --git a/src/libraries/Microsoft.PowerFx.LanguageServerProtocol/JsonRpc/FormulaTypeJsonConverter.cs b/src/libraries/Microsoft.PowerFx.LanguageServerProtocol/JsonRpc/FormulaTypeJsonConverter.cs index bbcc8eb482..1b38bae923 100644 --- a/src/libraries/Microsoft.PowerFx.LanguageServerProtocol/JsonRpc/FormulaTypeJsonConverter.cs +++ b/src/libraries/Microsoft.PowerFx.LanguageServerProtocol/JsonRpc/FormulaTypeJsonConverter.cs @@ -6,8 +6,8 @@ using System.Text.Json; using System.Text.Json.Serialization; using Microsoft.PowerFx.Core; -using Microsoft.PowerFx.Core.Public.Types; using Microsoft.PowerFx.Core.Utils; +using Microsoft.PowerFx.Types; namespace Microsoft.PowerFx.LanguageServerProtocol { diff --git a/src/libraries/Microsoft.PowerFx.LanguageServerProtocol/LanguageServer/IPowerFxScopeFactory.cs b/src/libraries/Microsoft.PowerFx.LanguageServerProtocol/LanguageServer/IPowerFxScopeFactory.cs index a7ced6912a..571071a1ed 100644 --- a/src/libraries/Microsoft.PowerFx.LanguageServerProtocol/LanguageServer/IPowerFxScopeFactory.cs +++ b/src/libraries/Microsoft.PowerFx.LanguageServerProtocol/LanguageServer/IPowerFxScopeFactory.cs @@ -2,6 +2,7 @@ // Licensed under the MIT license. using Microsoft.PowerFx.Core.Public; +using Microsoft.PowerFx.Intellisense; namespace Microsoft.PowerFx.Core { diff --git a/src/libraries/Microsoft.PowerFx.LanguageServerProtocol/LanguageServer/LanguageServer.cs b/src/libraries/Microsoft.PowerFx.LanguageServerProtocol/LanguageServer/LanguageServer.cs index e9c493a60c..ccf44e7e12 100644 --- a/src/libraries/Microsoft.PowerFx.LanguageServerProtocol/LanguageServer/LanguageServer.cs +++ b/src/libraries/Microsoft.PowerFx.LanguageServerProtocol/LanguageServer/LanguageServer.cs @@ -9,8 +9,8 @@ using Microsoft.PowerFx.Core; using Microsoft.PowerFx.Core.Errors; using Microsoft.PowerFx.Core.Public; -using Microsoft.PowerFx.Core.Texl.Intellisense; using Microsoft.PowerFx.Core.Utils; +using Microsoft.PowerFx.Intellisense; using Microsoft.PowerFx.LanguageServerProtocol.Protocol; namespace Microsoft.PowerFx.LanguageServerProtocol @@ -408,14 +408,14 @@ private CompletionItemKind GetCompletionItemKind(SuggestionKind kind) /// /// equivalent to . /// - private DiagnosticSeverity DocumentSeverityToDiagnosticSeverityMap(DocumentErrorSeverity severity) => severity switch + private DiagnosticSeverity DocumentSeverityToDiagnosticSeverityMap(ErrorSeverity severity) => severity switch { - DocumentErrorSeverity.Critical => DiagnosticSeverity.Error, - DocumentErrorSeverity.Severe => DiagnosticSeverity.Error, - DocumentErrorSeverity.Moderate => DiagnosticSeverity.Error, - DocumentErrorSeverity.Warning => DiagnosticSeverity.Warning, - DocumentErrorSeverity.Suggestion => DiagnosticSeverity.Hint, - DocumentErrorSeverity.Verbose => DiagnosticSeverity.Information, + ErrorSeverity.Critical => DiagnosticSeverity.Error, + ErrorSeverity.Severe => DiagnosticSeverity.Error, + ErrorSeverity.Moderate => DiagnosticSeverity.Error, + ErrorSeverity.Warning => DiagnosticSeverity.Warning, + ErrorSeverity.Suggestion => DiagnosticSeverity.Hint, + ErrorSeverity.Verbose => DiagnosticSeverity.Information, _ => DiagnosticSeverity.Information }; diff --git a/src/libraries/Microsoft.PowerFx.LanguageServerProtocol/Protocol/PublishExpressionTypeParams.cs b/src/libraries/Microsoft.PowerFx.LanguageServerProtocol/Protocol/PublishExpressionTypeParams.cs index a27c317b92..6a03d3e9cc 100644 --- a/src/libraries/Microsoft.PowerFx.LanguageServerProtocol/Protocol/PublishExpressionTypeParams.cs +++ b/src/libraries/Microsoft.PowerFx.LanguageServerProtocol/Protocol/PublishExpressionTypeParams.cs @@ -3,8 +3,7 @@ using System.Collections.Generic; using Microsoft.PowerFx.Core; -using Microsoft.PowerFx.Core.Public; -using Microsoft.PowerFx.Core.Public.Types; +using Microsoft.PowerFx.Types; namespace Microsoft.PowerFx.LanguageServerProtocol.Protocol { diff --git a/src/libraries/Microsoft.PowerFx.LanguageServerProtocol/Protocol/PublishTokensParams.cs b/src/libraries/Microsoft.PowerFx.LanguageServerProtocol/Protocol/PublishTokensParams.cs index a5841c0430..1e103f774f 100644 --- a/src/libraries/Microsoft.PowerFx.LanguageServerProtocol/Protocol/PublishTokensParams.cs +++ b/src/libraries/Microsoft.PowerFx.LanguageServerProtocol/Protocol/PublishTokensParams.cs @@ -2,8 +2,7 @@ // Licensed under the MIT license. using System.Collections.Generic; -using Microsoft.PowerFx.Core; -using Microsoft.PowerFx.Core.Public; +using Microsoft.PowerFx.Intellisense; namespace Microsoft.PowerFx.LanguageServerProtocol.Protocol { diff --git a/src/tests/Microsoft.PowerFx.Core.Tests/BindingEngineTests.cs b/src/tests/Microsoft.PowerFx.Core.Tests/BindingEngineTests.cs index 577f7633fa..4d7a9bc04a 100644 --- a/src/tests/Microsoft.PowerFx.Core.Tests/BindingEngineTests.cs +++ b/src/tests/Microsoft.PowerFx.Core.Tests/BindingEngineTests.cs @@ -2,10 +2,8 @@ // Licensed under the MIT license. using System.Linq; -using Microsoft.PowerFx.Core; -using Microsoft.PowerFx.Core.Public; -using Microsoft.PowerFx.Core.Public.Types; using Microsoft.PowerFx.Core.Tests; +using Microsoft.PowerFx.Types; using Xunit; namespace Microsoft.PowerFx.Tests diff --git a/src/tests/Microsoft.PowerFx.Core.Tests/DTypeTests.cs b/src/tests/Microsoft.PowerFx.Core.Tests/DTypeTests.cs index 64b58e695d..cd16d1a1b6 100644 --- a/src/tests/Microsoft.PowerFx.Core.Tests/DTypeTests.cs +++ b/src/tests/Microsoft.PowerFx.Core.Tests/DTypeTests.cs @@ -1,11 +1,6 @@ // Copyright (c) Microsoft Corporation. // Licensed under the MIT license. -using System.Collections; -using System.IO; -using System.Linq; -using System.Text.Json; -using Microsoft.PowerFx.Core.Public.Types; using Microsoft.PowerFx.Core.Types; using Xunit; diff --git a/src/tests/Microsoft.PowerFx.Core.Tests/DisplayNameTests.cs b/src/tests/Microsoft.PowerFx.Core.Tests/DisplayNameTests.cs index 79458dab86..2dcc0badaa 100644 --- a/src/tests/Microsoft.PowerFx.Core.Tests/DisplayNameTests.cs +++ b/src/tests/Microsoft.PowerFx.Core.Tests/DisplayNameTests.cs @@ -1,12 +1,11 @@ // Copyright (c) Microsoft Corporation. // Licensed under the MIT license. -using System.Globalization; using Microsoft.PowerFx.Core; -using Microsoft.PowerFx.Core.Public.Types; using Microsoft.PowerFx.Core.Tests; using Microsoft.PowerFx.Core.Types; using Microsoft.PowerFx.Core.Utils; +using Microsoft.PowerFx.Types; using Xunit; namespace Microsoft.PowerFx.Interpreter.Tests diff --git a/src/tests/Microsoft.PowerFx.Core.Tests/ExpressionErrorTests.cs b/src/tests/Microsoft.PowerFx.Core.Tests/ExpressionErrorTests.cs index fb79bcd14b..d162e82878 100644 --- a/src/tests/Microsoft.PowerFx.Core.Tests/ExpressionErrorTests.cs +++ b/src/tests/Microsoft.PowerFx.Core.Tests/ExpressionErrorTests.cs @@ -6,8 +6,6 @@ using System.Globalization; using System.Linq; using Microsoft.PowerFx.Core.Errors; -using Microsoft.PowerFx.Core.Lexer; -using Microsoft.PowerFx.Core.Lexer.Tokens; using Microsoft.PowerFx.Core.Localization; using Microsoft.PowerFx.Core.Public; using Microsoft.PowerFx.Core.Types; @@ -41,7 +39,7 @@ public void TestWarning() { Message = "ouch", Span = new Span(2, 5), - Severity = DocumentErrorSeverity.Warning + Severity = ErrorSeverity.Warning }; // Verify defaults for non-nullable objects diff --git a/src/tests/Microsoft.PowerFx.Core.Tests/ExpressionTestCases/AddColumns.txt b/src/tests/Microsoft.PowerFx.Core.Tests/ExpressionTestCases/AddColumns.txt index c39c758ac4..c9683d0c0d 100644 --- a/src/tests/Microsoft.PowerFx.Core.Tests/ExpressionTestCases/AddColumns.txt +++ b/src/tests/Microsoft.PowerFx.Core.Tests/ExpressionTestCases/AddColumns.txt @@ -5,7 +5,7 @@ Table({Double:2,Value:1},{Double:4,Value:2},{Double:6,Value:3},{Double:8,Value:4 Table({Blanks:Blank(),Value:1},{Blanks:Blank(),Value:2},{Blanks:Blank(),Value:3},{Blanks:Blank(),Value:4},{Blanks:Blank(),Value:5}) >> AddColumns([1,2,0,4,5], "Div", 20/Value) -Table({Div:20,Value:1},{Div:10,Value:2},{Div:Microsoft.PowerFx.Core.Public.Values.ErrorValue,Value:0},{Div:5,Value:4},{Div:4,Value:5}) +Table({Div:20,Value:1},{Div:10,Value:2},{Div:Microsoft.PowerFx.Types.ErrorValue,Value:0},{Div:5,Value:4},{Div:4,Value:5}) >> AddColumns(Sort([-2, -1, 0, 1, 2], 1 / Value), "Double", Value * 2) #Error(Kind=Div0) diff --git a/src/tests/Microsoft.PowerFx.Core.Tests/ExpressionTestCases/ArgCoercion.txt b/src/tests/Microsoft.PowerFx.Core.Tests/ExpressionTestCases/ArgCoercion.txt index 4031885373..05a8258650 100644 --- a/src/tests/Microsoft.PowerFx.Core.Tests/ExpressionTestCases/ArgCoercion.txt +++ b/src/tests/Microsoft.PowerFx.Core.Tests/ExpressionTestCases/ArgCoercion.txt @@ -10,7 +10,7 @@ Table({Result:"7"},{Result:"8"},{Result:"9"}) >> Char(["55", "Error Coercion", "57"]) -Table({Result:"7"},{Result:Microsoft.PowerFx.Core.Public.Values.ErrorValue},{Result:"9"}) +Table({Result:"7"},{Result:Microsoft.PowerFx.Types.ErrorValue},{Result:"9"}) >> Concatenate(123, "456") "123456" diff --git a/src/tests/Microsoft.PowerFx.Core.Tests/ExpressionTestCases/FilterFunctions.txt b/src/tests/Microsoft.PowerFx.Core.Tests/ExpressionTestCases/FilterFunctions.txt index ae2ec5c350..6410e227d3 100644 --- a/src/tests/Microsoft.PowerFx.Core.Tests/ExpressionTestCases/FilterFunctions.txt +++ b/src/tests/Microsoft.PowerFx.Core.Tests/ExpressionTestCases/FilterFunctions.txt @@ -37,7 +37,7 @@ 4 >> Filter([1,2,0,3,4], 1/ThisRecord.Value >= 0) -Table({Value:1},{Value:2},Microsoft.PowerFx.Core.Public.Values.ErrorValue,{Value:3},{Value:4}) +Table({Value:1},{Value:2},Microsoft.PowerFx.Types.ErrorValue,{Value:3},{Value:4}) >> Filter([1,2,0,3,4], Blank()) [] diff --git a/src/tests/Microsoft.PowerFx.Core.Tests/ExpressionTestCases/FindT.txt b/src/tests/Microsoft.PowerFx.Core.Tests/ExpressionTestCases/FindT.txt index 2ea484af67..e0ae9d2fba 100644 --- a/src/tests/Microsoft.PowerFx.Core.Tests/ExpressionTestCases/FindT.txt +++ b/src/tests/Microsoft.PowerFx.Core.Tests/ExpressionTestCases/FindT.txt @@ -8,7 +8,7 @@ Errors: Error 0-25: The function 'Find' has some invalid arguments.|Error 5-9: I Table({Result:1}) >> Find(If(false, ["blank table"], Blank()), If(false, ["blank table"], Blank()), [2]) -Table({Result:Microsoft.PowerFx.Core.Public.Values.ErrorValue}) +Table({Result:Microsoft.PowerFx.Types.ErrorValue}) >> Find(If(false, ["blank table"], Blank()), "textToBeSearchedIn", [5]) Table({Result:5}) @@ -29,13 +29,13 @@ Table({Result:Blank()},{Result:Blank()}) Table() >> Find([Blank(), "", ","], If(false, ["blank table"], Blank()), [1, 2, 3]) -Table({Result:1},{Result:Microsoft.PowerFx.Core.Public.Values.ErrorValue},{Result:Microsoft.PowerFx.Core.Public.Values.ErrorValue}) +Table({Result:1},{Result:Microsoft.PowerFx.Types.ErrorValue},{Result:Microsoft.PowerFx.Types.ErrorValue}) >> Find(If(false, ["blank table"], Blank()), [Blank(), "", "textToBeSearchedIn"], 1) Table({Result:1},{Result:1},{Result:1}) >> Find(If(false, ["blank table"], Blank()), [Blank(), "", "textToBeSearchedIn"], [1, 2, 3]) -Table({Result:1},{Result:Microsoft.PowerFx.Core.Public.Values.ErrorValue},{Result:3}) +Table({Result:1},{Result:Microsoft.PowerFx.Types.ErrorValue},{Result:3}) >> Find([Blank(), "", ","], "textToBeSearchedIn,textToBeSearchedIn", 1) Table({Result:1},{Result:1},{Result:19}) @@ -47,7 +47,7 @@ Table({Result:1},{Result:2},{Result:19},{Result:Blank()}) Table({Result:19}) >> Find(",", ["textToBeSearchedIn,textToBeSearchedIn", "textToBeSearchedIn,textToBeSearchedIn,", "textToBeSearchedIn,textToBeSearchedIn"], [1, 20, 40]) -Table({Result:19},{Result:38},{Result:Microsoft.PowerFx.Core.Public.Values.ErrorValue}) +Table({Result:19},{Result:38},{Result:Microsoft.PowerFx.Types.ErrorValue}) >> Find([Blank(), "", ","], ["textToBeSearchedIn,textToBeSearchedIn", "textToBeSearchedIn,textToBeSearchedIn,", "textToBeSearchedIn,textToBeSearchedIn"], [1, 10, 9]) Table({Result:1},{Result:10},{Result:19}) @@ -77,10 +77,10 @@ Table({Result:1},{Result:9},{Result:1},{Result:1}) Table({Result:1},{Result:9},{Result:1},{Result:Blank()}) >> Find([Blank(), ","], ["lastName,firstName",], [9, 2, 3]) -Table({Result:9},{Result:Microsoft.PowerFx.Core.Public.Values.ErrorValue},{Result:Microsoft.PowerFx.Core.Public.Values.ErrorValue}) +Table({Result:9},{Result:Microsoft.PowerFx.Types.ErrorValue},{Result:Microsoft.PowerFx.Types.ErrorValue}) >> Find([Blank(), ",", "", "findMe"], [Blank(), "lastName,firstName"], 10) -Table({Result:Microsoft.PowerFx.Core.Public.Values.ErrorValue},{Result:Blank()},{Result:Microsoft.PowerFx.Core.Public.Values.ErrorValue},{Result:Microsoft.PowerFx.Core.Public.Values.ErrorValue}) +Table({Result:Microsoft.PowerFx.Types.ErrorValue},{Result:Blank()},{Result:Microsoft.PowerFx.Types.ErrorValue},{Result:Microsoft.PowerFx.Types.ErrorValue}) >> Find([",", Blank()], "lastName,firstName", [1, 2, 3]) Table({Result:9},{Result:2},{Result:3}) @@ -122,20 +122,20 @@ Table() Table() >> Find("c", Table({ within: "abc" }, { within: Error({Kind: ErrorKind.Validation}) }, { within: "cde" })) -Table({Result:3},{Result:Microsoft.PowerFx.Core.Public.Values.ErrorValue},{Result:1}) +Table({Result:3},{Result:Microsoft.PowerFx.Types.ErrorValue},{Result:1}) >> Find("c", ["abc", Error({Kind: ErrorKind.Validation}), "cde"]) -Table({Result:3},{Result:Microsoft.PowerFx.Core.Public.Values.ErrorValue},{Result:1}) +Table({Result:3},{Result:Microsoft.PowerFx.Types.ErrorValue},{Result:1}) >> Find(Table({ find: "a" }, { find: Error({Kind: ErrorKind.Validation}) }, { find: "b" }), "abc") -Table({Result:1},{Result:Microsoft.PowerFx.Core.Public.Values.ErrorValue},{Result:2}) +Table({Result:1},{Result:Microsoft.PowerFx.Types.ErrorValue},{Result:2}) >> Find(["a", Error({Kind: ErrorKind.Validation}), "b"], "abc") -Table({Result:1},{Result:Microsoft.PowerFx.Core.Public.Values.ErrorValue},{Result:2}) +Table({Result:1},{Result:Microsoft.PowerFx.Types.ErrorValue},{Result:2}) >> Find(Table({ find: "a" }, { find: Mid("Hello", -1) }, { find: "b" }, If(1/0>2, { find: "e" }), { find: "c" }), Table({ within: "abc" }, If(Sqrt(-1)<0, { within: "err" }), { within: Left("err", -1) }, If(Right("err", -3) = "err", { within: "err" }), { within: "abc" })) -Table({Result:1},Microsoft.PowerFx.Core.Public.Values.ErrorValue,{Result:Microsoft.PowerFx.Core.Public.Values.ErrorValue},Microsoft.PowerFx.Core.Public.Values.ErrorValue,{Result:3}) -//actual: Microsoft.PowerFx.Core.Public.Values.ErrorValue +Table({Result:1},Microsoft.PowerFx.Types.ErrorValue,{Result:Microsoft.PowerFx.Types.ErrorValue},Microsoft.PowerFx.Types.ErrorValue,{Result:3}) +//actual: Microsoft.PowerFx.Types.ErrorValue >> Find(Table({ find: "a" }, { find: "b" }, { find: "c" }), If(1/0>2,"abcdef")) #Error(Kind=Div0) diff --git a/src/tests/Microsoft.PowerFx.Core.Tests/ExpressionTestCases/ForAll.txt b/src/tests/Microsoft.PowerFx.Core.Tests/ExpressionTestCases/ForAll.txt index 3d085bc3c2..f27c6f3048 100644 --- a/src/tests/Microsoft.PowerFx.Core.Tests/ExpressionTestCases/ForAll.txt +++ b/src/tests/Microsoft.PowerFx.Core.Tests/ExpressionTestCases/ForAll.txt @@ -31,13 +31,13 @@ Blank() #Error >> ForAll(Table({Value:1,Zulu:1}, {Value:0,Zulu:0}, {Value:2,Zulu:2}), 1/ThisRecord.Value) -[1,Microsoft.PowerFx.Core.Public.Values.ErrorValue,0.5] +[1,Microsoft.PowerFx.Types.ErrorValue,0.5] >> First(LastN(ForAll(Table({Value:1,Zulu:1}, {Value:0,Zulu:0}, {Value:2,Zulu:2}), 1/ThisRecord.Value), 2)).Value #Error >> Table({Value:1},First(LastN(ForAll(Table({Value:1,Zulu:1}, {Value:0,Zulu:0}, {Value:2,Zulu:2}), 1/ThisRecord.Value), 2)),{Value:2}) -[1,Microsoft.PowerFx.Core.Public.Values.ErrorValue,2] +[1,Microsoft.PowerFx.Types.ErrorValue,2] >> First(First(LastN(ForAll(Table({Value:1}, {Value:0}, {Value:2}), Table({a: 1/ThisRecord.Value})), 2)).Value) -{a:Microsoft.PowerFx.Core.Public.Values.ErrorValue} \ No newline at end of file +{a:Microsoft.PowerFx.Types.ErrorValue} \ No newline at end of file diff --git a/src/tests/Microsoft.PowerFx.Core.Tests/ExpressionTestCases/TableStringfuncs.txt b/src/tests/Microsoft.PowerFx.Core.Tests/ExpressionTestCases/TableStringfuncs.txt index d126a93fcc..1fd5185938 100644 --- a/src/tests/Microsoft.PowerFx.Core.Tests/ExpressionTestCases/TableStringfuncs.txt +++ b/src/tests/Microsoft.PowerFx.Core.Tests/ExpressionTestCases/TableStringfuncs.txt @@ -12,22 +12,22 @@ Table() #Error >> Concatenate("a", ["hello", Mid("great", -1), "world"]) -Table({Result:"ahello"},{Result:Microsoft.PowerFx.Core.Public.Values.ErrorValue},{Result:"aworld"}) +Table({Result:"ahello"},{Result:Microsoft.PowerFx.Types.ErrorValue},{Result:"aworld"}) >> Concatenate("a", Table({a:"one"},If(1<0,{a:"two"}),{a:"three"})) Table({Result:"aone"},{Result:"a"},{Result:"athree"}) >> Concatenate("a", Table({a:"one"},If(1/0<2,{a:"two"}),{a:"three"})) -Table({Result:"aone"},Microsoft.PowerFx.Core.Public.Values.ErrorValue,{Result:"athree"}) +Table({Result:"aone"},Microsoft.PowerFx.Types.ErrorValue,{Result:"athree"}) >> Concatenate(Blank(), ["hello", Mid("great", -1), "world"]) -Table({Result:"hello"},{Result:Microsoft.PowerFx.Core.Public.Values.ErrorValue},{Result:"world"}) +Table({Result:"hello"},{Result:Microsoft.PowerFx.Types.ErrorValue},{Result:"world"}) >> Concatenate(Blank(), Table({a:"one"},If(1<0,{a:"two"}),{a:"three"})) Table({Result:"one"},{Result:""},{Result:"three"}) >> Concatenate(Blank(), Table({a:"one"},If(1/0<2,{a:"two"}),{a:"three"})) -Table({Result:"one"},Microsoft.PowerFx.Core.Public.Values.ErrorValue,{Result:"three"}) +Table({Result:"one"},Microsoft.PowerFx.Types.ErrorValue,{Result:"three"}) // Table + Scalar (Reverse Arguments) >> Concatenate(Table({b:"1"},{b:"2"}), "a") @@ -43,22 +43,22 @@ Table() #Error >> Concatenate(["hello", Mid("great", -1), "world"], "a") -Table({Result:"helloa"},{Result:Microsoft.PowerFx.Core.Public.Values.ErrorValue},{Result:"worlda"}) +Table({Result:"helloa"},{Result:Microsoft.PowerFx.Types.ErrorValue},{Result:"worlda"}) >> Concatenate(Table({a:"one"},If(1<0,{a:"two"}),{a:"three"}), "a") Table({Result:"onea"},{Result:"a"},{Result:"threea"}) >> Concatenate(Table({a:"one"},If(1/0<2,{a:"two"}),{a:"three"}), "a") -Table({Result:"onea"},Microsoft.PowerFx.Core.Public.Values.ErrorValue,{Result:"threea"}) +Table({Result:"onea"},Microsoft.PowerFx.Types.ErrorValue,{Result:"threea"}) >> Concatenate(["hello", Mid("great", -1), "world"], Blank()) -Table({Result:"hello"},{Result:Microsoft.PowerFx.Core.Public.Values.ErrorValue},{Result:"world"}) +Table({Result:"hello"},{Result:Microsoft.PowerFx.Types.ErrorValue},{Result:"world"}) >> Concatenate(Table({a:"one"},If(1<0,{a:"two"}),{a:"three"}), Blank()) Table({Result:"one"},{Result:""},{Result:"three"}) >> Concatenate(Table({a:"one"},If(1/0<2,{a:"two"}),{a:"three"}), Blank()) -Table({Result:"one"},Microsoft.PowerFx.Core.Public.Values.ErrorValue,{Result:"three"}) +Table({Result:"one"},Microsoft.PowerFx.Types.ErrorValue,{Result:"three"}) // Table + Table >> Concatenate(["one", "two"], [1, 2, 3, 4]) @@ -71,13 +71,13 @@ Table({Result:"one"},{Result:"two"}) Table({Result:"one"},{Result:"two"}) >> Concatenate(["one", "two"], If(1/0<2, ["txt"])) -Microsoft.PowerFx.Core.Public.Values.ErrorValue +Microsoft.PowerFx.Types.ErrorValue >> Concatenate(["one", "two"], Table({a:"one"},If(1<0,{a:"two"}),{a:"three"})) Table({Result:"oneone"},{Result:"two"},{Result:"three"}) >> Concatenate(["one", "two"], ["hello", Mid("great", -1), "world"]) -Table({Result:"onehello"},{Result:Microsoft.PowerFx.Core.Public.Values.ErrorValue},{Result:"world"}) +Table({Result:"onehello"},{Result:Microsoft.PowerFx.Types.ErrorValue},{Result:"world"}) >> Concatenate(["a","b","c","d"], "-", ["1", "2"], "-", ["x", "y", "z"], "!") Table({Result:"a-1-x!"},{Result:"b-2-y!"},{Result:"c--z!"},{Result:"d--!"}) \ No newline at end of file diff --git a/src/tests/Microsoft.PowerFx.Core.Tests/ExpressionTestCases/TrigTableFunctions.txt b/src/tests/Microsoft.PowerFx.Core.Tests/ExpressionTestCases/TrigTableFunctions.txt index 0db82f8327..1bd471172f 100644 --- a/src/tests/Microsoft.PowerFx.Core.Tests/ExpressionTestCases/TrigTableFunctions.txt +++ b/src/tests/Microsoft.PowerFx.Core.Tests/ExpressionTestCases/TrigTableFunctions.txt @@ -2,10 +2,10 @@ Table({a:0},{a:0.5},{a:1}) >> Sin(Table({a:0},{a:1/0},{a:Pi()/2})) -Table({a:0},{a:Microsoft.PowerFx.Core.Public.Values.ErrorValue},{a:1}) +Table({a:0},{a:Microsoft.PowerFx.Types.ErrorValue},{a:1}) >> Sin(Table({a:0},{a:Pi()/6},If(1/0<2,{a:Pi()}))) -Table({a:0},{a:0.5},Microsoft.PowerFx.Core.Public.Values.ErrorValue) +Table({a:0},{a:0.5},Microsoft.PowerFx.Types.ErrorValue) >> Round(Sin([0, Pi(), Pi()/2, -Pi()/2, 3*Pi()/2, 2*Pi(), Pi()/4, -Pi()/4, Blank()]), 4) [0, 0, 1, -1, -1, -0, 0.7071, -0.7071, 0] @@ -14,10 +14,10 @@ Table({a:0},{a:0.5},Microsoft.PowerFx.Core.Public.Values.ErrorValue) Table({a:1},{a:0.5},{a:0}) >> Cos(Table({a:1/0},{a:Pi()/3},{a:Pi()/2})) -Table({a:Microsoft.PowerFx.Core.Public.Values.ErrorValue},{a:0.5},{a:0}) +Table({a:Microsoft.PowerFx.Types.ErrorValue},{a:0.5},{a:0}) >> Cos(Table({a:0},If(1/0<2,{a:Pi()/3}),{a:Pi()/2})) -Table({a:1},Microsoft.PowerFx.Core.Public.Values.ErrorValue,{a:0}) +Table({a:1},Microsoft.PowerFx.Types.ErrorValue,{a:0}) >> Round(Cos([0, Pi(), Pi()/2, -Pi()/2, 3*Pi()/2, 2*Pi(), Pi()/4, -Pi()/4, Blank()]), 4) [1, -1, 0, 0, -0, 1, 0.7071, 0.7071, 1] @@ -26,10 +26,10 @@ Table({a:1},Microsoft.PowerFx.Core.Public.Values.ErrorValue,{a:0}) Table({a:0},{a:1},{a:-1}) >> Tan(Table({a:1/0},{a:Pi()/4},{a:-Pi()/4})) -Table({a:Microsoft.PowerFx.Core.Public.Values.ErrorValue},{a:1},{a:-1}) +Table({a:Microsoft.PowerFx.Types.ErrorValue},{a:1},{a:-1}) >> Tan(Table(If(1/0<2,{a:0}),{a:Pi()/4},{a:-Pi()/4})) -Table(Microsoft.PowerFx.Core.Public.Values.ErrorValue,{a:1},{a:-1}) +Table(Microsoft.PowerFx.Types.ErrorValue,{a:1},{a:-1}) >> Round(Tan([0, Pi(), 2*Pi(), Pi()/4, -Pi()/4, Blank()]), 4) [0, -0, -0, 1, -1, 0] @@ -38,10 +38,10 @@ Table(Microsoft.PowerFx.Core.Public.Values.ErrorValue,{a:1},{a:-1}) Table({a:0},{a:1},{a:-1}) >> Cot(Table({a:Pi()/2},{a:0},{a:-Pi()/4})) -Table({a:0},{a:Microsoft.PowerFx.Core.Public.Values.ErrorValue},{a:-1}) +Table({a:0},{a:Microsoft.PowerFx.Types.ErrorValue},{a:-1}) >> Cot(Table({a:Pi()/2},If(Sqrt(-1)<1,{a:Pi()/4}),{a:-Pi()/4})) -Table({a:0},Microsoft.PowerFx.Core.Public.Values.ErrorValue,{a:-1}) +Table({a:0},Microsoft.PowerFx.Types.ErrorValue,{a:-1}) >> Round(Cot([Pi()/2, -Pi()/2, 3*Pi()/2, Pi()/4, -Pi()/4]), 4) [0, -0, 0, 1, -1] diff --git a/src/tests/Microsoft.PowerFx.Core.Tests/ExpressionTestHelpers/BaseRunner.cs b/src/tests/Microsoft.PowerFx.Core.Tests/ExpressionTestHelpers/BaseRunner.cs index c9760c8d1b..4289875f29 100644 --- a/src/tests/Microsoft.PowerFx.Core.Tests/ExpressionTestHelpers/BaseRunner.cs +++ b/src/tests/Microsoft.PowerFx.Core.Tests/ExpressionTestHelpers/BaseRunner.cs @@ -8,8 +8,7 @@ using System.Text.RegularExpressions; using System.Threading; using System.Threading.Tasks; -using Microsoft.PowerFx.Core.Public; -using Microsoft.PowerFx.Core.Public.Values; +using Microsoft.PowerFx.Types; using Newtonsoft.Json.Linq; namespace Microsoft.PowerFx.Core.Tests @@ -67,7 +66,7 @@ public static RunResult FromError(string message) new ExpressionError { Message = message, - Severity = Core.Errors.DocumentErrorSeverity.Severe + Severity = ErrorSeverity.Severe } } }; @@ -109,20 +108,20 @@ public abstract class BaseRunner }); t.Start(); bool success; - while (true) + while (true) { success = t.Join(Timeout); if (!success && Debugger.IsAttached) { // Aid in debugging. Debugger.Log(0, null, $"Test case {testCase} running...\r\n"); - + // Debugger.Break(); continue; } break; - } + } if (success) { @@ -165,7 +164,7 @@ public abstract class BaseRunner { RunResult runResult = null; FormulaValue result = null; - + var expected = testCase.Expected; var expectedSkip = string.Equals(expected, "#skip", StringComparison.OrdinalIgnoreCase); if (expectedSkip) @@ -178,7 +177,7 @@ public abstract class BaseRunner { runResult = await RunAsyncInternal(testCase.Input, testCase.SetupHandlerName); result = runResult.Value; - + // Unsupported is just for ignoring large groups of inherited tests. // If it's an override, then the override should specify the exact error. if (!testCase.IsOverride && runResult.UnsupportedReason != null) @@ -247,31 +246,31 @@ public abstract class BaseRunner var expectedKind = expectedErrorKinds[i]; if (int.TryParse(expectedKind, out var numericErrorKind)) + { + // Error given as the internal value + if (numericErrorKind == (int)actualErrorKind) { - // Error given as the internal value - if (numericErrorKind == (int)actualErrorKind) - { return (tr: TestResult.Pass, err: null); - } - else - { + } + else + { return (tr: TestResult.Fail, err: $"Received an error, but expected kind={expectedKind} and received {actualErrorKind} ({(int)actualErrorKind})"); - } } + } else if (Enum.TryParse(expectedKind, out var errorKind)) + { + // Error given as the enum name + if (errorKind == actualErrorKind) { - // Error given as the enum name - if (errorKind == actualErrorKind) - { return (tr: TestResult.Pass, null); - } - else - { - return (tr: TestResult.Fail, err: $"Received an error, but expected kind={errorKind} and received {actualErrorKind}"); - } } else { + return (tr: TestResult.Fail, err: $"Received an error, but expected kind={errorKind} and received {actualErrorKind}"); + } + } + else + { return (tr: TestResult.Fail, err: $"Invalid expected error kind: {expectedKind}"); } }).ToArray(); @@ -290,7 +289,7 @@ public abstract class BaseRunner } } - // If the actual result is not an error, we'll fail with a mismatch below + // If the actual result is not an error, we'll fail with a mismatch below if (result == null) { var msg = "Did not return a value"; @@ -298,7 +297,7 @@ public abstract class BaseRunner if (runResult.Errors != null && runResult.Errors.Any()) { msg += string.Join(string.Empty, runResult.Errors.Select(err => "\r\n" + err)); - } + } return (TestResult.Fail, msg); } diff --git a/src/tests/Microsoft.PowerFx.Core.Tests/ExpressionTestHelpers/TestRunner.cs b/src/tests/Microsoft.PowerFx.Core.Tests/ExpressionTestHelpers/TestRunner.cs index 1691f956f5..14dda5ddfb 100644 --- a/src/tests/Microsoft.PowerFx.Core.Tests/ExpressionTestHelpers/TestRunner.cs +++ b/src/tests/Microsoft.PowerFx.Core.Tests/ExpressionTestHelpers/TestRunner.cs @@ -6,8 +6,7 @@ using System.IO; using System.Linq; using System.Text; -using Microsoft.PowerFx.Core.Public.Types; -using Microsoft.PowerFx.Core.Public.Values; +using Microsoft.PowerFx.Types; namespace Microsoft.PowerFx.Core.Tests { diff --git a/src/tests/Microsoft.PowerFx.Core.Tests/ExpressionTestHelpers/TestRunnerSummary.cs b/src/tests/Microsoft.PowerFx.Core.Tests/ExpressionTestHelpers/TestRunnerSummary.cs index 1078aa2b31..a261c2a13a 100644 --- a/src/tests/Microsoft.PowerFx.Core.Tests/ExpressionTestHelpers/TestRunnerSummary.cs +++ b/src/tests/Microsoft.PowerFx.Core.Tests/ExpressionTestHelpers/TestRunnerSummary.cs @@ -7,8 +7,7 @@ using System.IO; using System.Linq; using System.Text; -using Microsoft.PowerFx.Core.Public.Types; -using Microsoft.PowerFx.Core.Public.Values; +using Microsoft.PowerFx.Types; namespace Microsoft.PowerFx.Core.Tests { diff --git a/src/tests/Microsoft.PowerFx.Core.Tests/FormatterTests.cs b/src/tests/Microsoft.PowerFx.Core.Tests/FormatterTests.cs index 929b6921de..4e76e16ed5 100644 --- a/src/tests/Microsoft.PowerFx.Core.Tests/FormatterTests.cs +++ b/src/tests/Microsoft.PowerFx.Core.Tests/FormatterTests.cs @@ -2,12 +2,9 @@ // Licensed under the MIT license. using System.Linq; -using Microsoft.PowerFx.Core.Errors; -using Microsoft.PowerFx.Core.Lexer; using Microsoft.PowerFx.Core.Logging; -using Microsoft.PowerFx.Core.Syntax; -using Microsoft.PowerFx.Core.Syntax.Nodes; using Microsoft.PowerFx.Core.Tests; +using Microsoft.PowerFx.Syntax; using Xunit; using static Microsoft.PowerFx.Core.Parser.TexlParser; @@ -70,7 +67,7 @@ public void TestStucturalPrintWithCustomSanitizer(string script, string expected [InlineData("RGBA(\n 255,\n /*r */255, ", true)] public void TestSeverityLevelsForPrettyPrint(string script, bool expected) { - FeatureFlags.StringInterpolation = true; + Preview.FeatureFlags.StringInterpolation = true; var result = ParseScript( script, flags: Flags.EnableExpressionChaining); @@ -78,7 +75,7 @@ public void TestSeverityLevelsForPrettyPrint(string script, bool expected) // Can't pretty print a script with errors. var hasErrorsWithSeverityHigherThanWarning = false; - if (result.Errors != null && result.Errors.Any(x => x.Severity > DocumentErrorSeverity.Warning)) + if (result.Errors != null && result.Errors.Any(x => x.Severity > ErrorSeverity.Warning)) { hasErrorsWithSeverityHigherThanWarning = true; } @@ -154,7 +151,7 @@ public void TestRemoveWhiteSpace(string script, string expected) [InlineData("$\"Hello {\"World\"}\"/*b*/", "$\"Hello {\"World\"}\"/*b*/")] public void TestPrettyPrint(string script, string expected) { - FeatureFlags.StringInterpolation = true; + Preview.FeatureFlags.StringInterpolation = true; var result = Format(script); Assert.NotNull(result); Assert.Equal(expected, result); diff --git a/src/tests/Microsoft.PowerFx.Core.Tests/FormulaSetTests.cs b/src/tests/Microsoft.PowerFx.Core.Tests/FormulaSetTests.cs index 4620f8f1b8..790768f285 100644 --- a/src/tests/Microsoft.PowerFx.Core.Tests/FormulaSetTests.cs +++ b/src/tests/Microsoft.PowerFx.Core.Tests/FormulaSetTests.cs @@ -3,9 +3,8 @@ using System.Collections.Generic; using Microsoft.PowerFx.Core.Public; -using Microsoft.PowerFx.Core.Syntax.Nodes; -using Microsoft.PowerFx.Core.Syntax.Visitors; using Microsoft.PowerFx.Core.Utils; +using Microsoft.PowerFx.Syntax; using Xunit; namespace Microsoft.PowerFx.Core.Tests diff --git a/src/tests/Microsoft.PowerFx.Core.Tests/IRTests/IRTranslatorTests.cs b/src/tests/Microsoft.PowerFx.Core.Tests/IRTests/IRTranslatorTests.cs index eed76612bb..4c08534f59 100644 --- a/src/tests/Microsoft.PowerFx.Core.Tests/IRTests/IRTranslatorTests.cs +++ b/src/tests/Microsoft.PowerFx.Core.Tests/IRTests/IRTranslatorTests.cs @@ -2,13 +2,11 @@ // Licensed under the MIT license. using System; -using System.Globalization; using System.Linq; -using System.Linq.Expressions; using Microsoft.PowerFx.Core.IR; using Microsoft.PowerFx.Core.IR.Nodes; -using Microsoft.PowerFx.Core.Public.Types; using Microsoft.PowerFx.Core.Types.Enums; +using Microsoft.PowerFx.Types; using Xunit; using CallNode = Microsoft.PowerFx.Core.IR.Nodes.CallNode; diff --git a/src/tests/Microsoft.PowerFx.Core.Tests/IdentTests.cs b/src/tests/Microsoft.PowerFx.Core.Tests/IdentTests.cs index a9af8fa1de..8c2623aa86 100644 --- a/src/tests/Microsoft.PowerFx.Core.Tests/IdentTests.cs +++ b/src/tests/Microsoft.PowerFx.Core.Tests/IdentTests.cs @@ -2,8 +2,7 @@ // Licensed under the MIT license. using System; -using Microsoft.PowerFx.Core.Lexer; -using Microsoft.PowerFx.Core.Lexer.Tokens; +using Microsoft.PowerFx.Syntax; using Xunit; namespace Microsoft.PowerFx.Core.Tests diff --git a/src/tests/Microsoft.PowerFx.Core.Tests/IntellisenseTests/IntellisenseTestBase.cs b/src/tests/Microsoft.PowerFx.Core.Tests/IntellisenseTests/IntellisenseTestBase.cs index b0ead7bd0d..3d00b76648 100644 --- a/src/tests/Microsoft.PowerFx.Core.Tests/IntellisenseTests/IntellisenseTestBase.cs +++ b/src/tests/Microsoft.PowerFx.Core.Tests/IntellisenseTests/IntellisenseTestBase.cs @@ -3,11 +3,10 @@ using System.Linq; using System.Text.RegularExpressions; -using Microsoft.PowerFx.Core; -using Microsoft.PowerFx.Core.Public.Types; using Microsoft.PowerFx.Core.Tests; -using Microsoft.PowerFx.Core.Texl.Intellisense; using Microsoft.PowerFx.Core.Types; +using Microsoft.PowerFx.Intellisense; +using Microsoft.PowerFx.Types; using Xunit; namespace Microsoft.PowerFx.Tests.IntellisenseTests diff --git a/src/tests/Microsoft.PowerFx.Core.Tests/IntellisenseTests/SignatureHelpTest.cs b/src/tests/Microsoft.PowerFx.Core.Tests/IntellisenseTests/SignatureHelpTest.cs index 6abb81c7fc..c7c402245b 100644 --- a/src/tests/Microsoft.PowerFx.Core.Tests/IntellisenseTests/SignatureHelpTest.cs +++ b/src/tests/Microsoft.PowerFx.Core.Tests/IntellisenseTests/SignatureHelpTest.cs @@ -4,7 +4,7 @@ using System.Globalization; using System.IO; using Microsoft.PowerFx.Core; -using Microsoft.PowerFx.Core.Texl.Intellisense.SignatureHelp; +using Microsoft.PowerFx.Intellisense.SignatureHelp; using Newtonsoft.Json; using Newtonsoft.Json.Linq; using Xunit; diff --git a/src/tests/Microsoft.PowerFx.Core.Tests/IntellisenseTests/SuggestTest.cs b/src/tests/Microsoft.PowerFx.Core.Tests/IntellisenseTests/SuggestTest.cs index b26dc2313c..5fa7cfabf6 100644 --- a/src/tests/Microsoft.PowerFx.Core.Tests/IntellisenseTests/SuggestTest.cs +++ b/src/tests/Microsoft.PowerFx.Core.Tests/IntellisenseTests/SuggestTest.cs @@ -159,7 +159,7 @@ public void TestSuggest(string expression, params string[] expectedSuggestions) // Note that the expression string needs to have balanced quotes or we hit a bug in NUnit running the tests: // https://github.com/nunit/nunit3-vs-adapter/issues/691 - FeatureFlags.StringInterpolation = true; + Preview.FeatureFlags.StringInterpolation = true; var actualSuggestions = SuggestStrings(expression, Default); Assert.Equal(expectedSuggestions, actualSuggestions); } @@ -177,7 +177,7 @@ public void TestSuggest(string expression, params string[] expectedSuggestions) [InlineData("DisplayMode|")] public void TestSuggestEmptyEnumList(string expression, params string[] expectedSuggestions) { - FeatureFlags.StringInterpolation = true; + Preview.FeatureFlags.StringInterpolation = true; var actualSuggestions = SuggestStrings(expression, EmptyEverything); Assert.Equal(expectedSuggestions, actualSuggestions); } @@ -190,7 +190,7 @@ public void TestSuggestEmptyEnumList(string expression, params string[] expected [InlineData("Calendar.Months|", "MonthsLong", "MonthsShort")] public void TestSuggestEmptyAll(string expression, params string[] expectedSuggestions) { - FeatureFlags.StringInterpolation = true; + Preview.FeatureFlags.StringInterpolation = true; var actualSuggestions = SuggestStrings(expression, MinimalEnums); Assert.Equal(expectedSuggestions, actualSuggestions); } diff --git a/src/tests/Microsoft.PowerFx.Core.Tests/LexerTests.cs b/src/tests/Microsoft.PowerFx.Core.Tests/LexerTests.cs index b5e051c122..fa8947233f 100644 --- a/src/tests/Microsoft.PowerFx.Core.Tests/LexerTests.cs +++ b/src/tests/Microsoft.PowerFx.Core.Tests/LexerTests.cs @@ -4,10 +4,9 @@ using System; using System.Globalization; using System.Linq; -using Microsoft.PowerFx.Core.Lexer; -using Microsoft.PowerFx.Core.Lexer.Tokens; using Microsoft.PowerFx.Core.Localization; using Microsoft.PowerFx.Core.Types; +using Microsoft.PowerFx.Syntax; using Xunit; namespace Microsoft.PowerFx.Core.Tests diff --git a/src/tests/Microsoft.PowerFx.Core.Tests/NamedFormulasTests.cs b/src/tests/Microsoft.PowerFx.Core.Tests/NamedFormulasTests.cs index 0b4771975a..86f7e9ebed 100644 --- a/src/tests/Microsoft.PowerFx.Core.Tests/NamedFormulasTests.cs +++ b/src/tests/Microsoft.PowerFx.Core.Tests/NamedFormulasTests.cs @@ -2,8 +2,7 @@ // Licensed under the MIT license. using System.Linq; -using Microsoft.PowerFx.Core.Lexer.Tokens; -using Microsoft.PowerFx.Core.Syntax; +using Microsoft.PowerFx.Syntax; using Xunit; namespace Microsoft.PowerFx.Core.Tests diff --git a/src/tests/Microsoft.PowerFx.Core.Tests/ParseTests.cs b/src/tests/Microsoft.PowerFx.Core.Tests/ParseTests.cs index 989c2bc6d9..36933f5d02 100644 --- a/src/tests/Microsoft.PowerFx.Core.Tests/ParseTests.cs +++ b/src/tests/Microsoft.PowerFx.Core.Tests/ParseTests.cs @@ -3,11 +3,9 @@ using System; using System.Linq; -using Microsoft.PowerFx.Core.Lexer; using Microsoft.PowerFx.Core.Localization; using Microsoft.PowerFx.Core.Parser; -using Microsoft.PowerFx.Core.Syntax; -using Microsoft.PowerFx.Core.Syntax.Nodes; +using Microsoft.PowerFx.Syntax; using Xunit; namespace Microsoft.PowerFx.Core.Tests diff --git a/src/tests/Microsoft.PowerFx.Core.Tests/PublicSurfaceTests.cs b/src/tests/Microsoft.PowerFx.Core.Tests/PublicSurfaceTests.cs index 3f9116c4b1..f370874643 100644 --- a/src/tests/Microsoft.PowerFx.Core.Tests/PublicSurfaceTests.cs +++ b/src/tests/Microsoft.PowerFx.Core.Tests/PublicSurfaceTests.cs @@ -6,8 +6,7 @@ using System.Linq; using System.Reflection; using System.Text; -using Microsoft.PowerFx.Core.Lexer.Tokens; -using Microsoft.PowerFx.Core.Syntax.Nodes; +using Microsoft.PowerFx.Syntax; using Xunit; namespace Microsoft.PowerFx.Core.Tests @@ -19,126 +18,149 @@ public void Test() { var asm = typeof(Parser.TexlParser).Assembly; + // The goal for public namespaces is to make the SDK easy for the consumer. + // Namespace principles for public classes: // + // - prefer fewer namespaces. See C# for example: https://docs.microsoft.com/en-us/dotnet/api/microsoft.codeanalysis + // - For easy discovery, but Engine in "Microsoft.PowerFx". + // - For sub areas with many related classes, cluster into a single subnamespace. + // - Avoid nesting more than 1 level deep + var allowed = new HashSet() { + // Core namespace. + "Microsoft.PowerFx.PowerFxConfig", + "Microsoft.PowerFx.CheckResult", + "Microsoft.PowerFx.ParseResult", + "Microsoft.PowerFx.FunctionInfo", + "Microsoft.PowerFx.NameCollisionException", + "Microsoft.PowerFx.ErrorKind", + "Microsoft.PowerFx.ExpressionError", + "Microsoft.PowerFx.FormulaWithParameters", + "Microsoft.PowerFx.IExpression", + "Microsoft.PowerFx.IExpressionExtensions", + "Microsoft.PowerFx.IPowerFxEngine", + "Microsoft.PowerFx.ParserOptions", + "Microsoft.PowerFx.Engine", + "Microsoft.PowerFx.ErrorSeverity", + + // Feature flags are experimental - hosts shouldn't use it. + "Microsoft.PowerFx.Preview.FeatureFlags", + + // Lexer + "Microsoft.PowerFx.Syntax.BinaryOp", + "Microsoft.PowerFx.Syntax.TokKind", + "Microsoft.PowerFx.Syntax.CommentToken", + "Microsoft.PowerFx.Syntax.ErrorToken", + "Microsoft.PowerFx.Syntax.IdentToken", + "Microsoft.PowerFx.Syntax.NumLitToken", + "Microsoft.PowerFx.Syntax.StrLitToken", + "Microsoft.PowerFx.Syntax.Token", + "Microsoft.PowerFx.Syntax.UnaryOp", + "Microsoft.PowerFx.Syntax.VariadicOp", + + // Parse nodes + "Microsoft.PowerFx.Syntax.Identifier", + "Microsoft.PowerFx.Syntax.NodeKind", + "Microsoft.PowerFx.Syntax.AsNode", + "Microsoft.PowerFx.Syntax.BinaryOpNode", + "Microsoft.PowerFx.Syntax.BlankNode", + "Microsoft.PowerFx.Syntax.BoolLitNode", + "Microsoft.PowerFx.Syntax.CallNode", + "Microsoft.PowerFx.Syntax.DottedNameNode", + "Microsoft.PowerFx.Syntax.ErrorNode", + "Microsoft.PowerFx.Syntax.FirstNameNode", + "Microsoft.PowerFx.Syntax.ListNode", + "Microsoft.PowerFx.Syntax.NameNode", + "Microsoft.PowerFx.Syntax.NumLitNode", + "Microsoft.PowerFx.Syntax.ParentNode", + "Microsoft.PowerFx.Syntax.RecordNode", + "Microsoft.PowerFx.Syntax.SelfNode", + "Microsoft.PowerFx.Syntax.StrInterpNode", + "Microsoft.PowerFx.Syntax.StrLitNode", + "Microsoft.PowerFx.Syntax.TableNode", + "Microsoft.PowerFx.Syntax.TexlNode", + "Microsoft.PowerFx.Syntax.UnaryOpNode", + "Microsoft.PowerFx.Syntax.VariadicBase", + "Microsoft.PowerFx.Syntax.VariadicOpNode", + + // Visitors + "Microsoft.PowerFx.Syntax.IdentityTexlVisitor", + "Microsoft.PowerFx.Syntax.TexlFunctionalVisitor`2", + "Microsoft.PowerFx.Syntax.TexlVisitor", + + // Power Fx Type system and Values. + "Microsoft.PowerFx.Types.AggregateType", + "Microsoft.PowerFx.Types.BlankType", + "Microsoft.PowerFx.Types.BooleanType", + "Microsoft.PowerFx.Types.ColorType", + "Microsoft.PowerFx.Types.DateTimeNoTimeZoneType", + "Microsoft.PowerFx.Types.DateTimeType", + "Microsoft.PowerFx.Types.DateType", + "Microsoft.PowerFx.Types.ExternalType", + "Microsoft.PowerFx.Types.ExternalTypeKind", + "Microsoft.PowerFx.Types.FormulaType", + "Microsoft.PowerFx.Types.GuidType", + "Microsoft.PowerFx.Types.HyperlinkType", + "Microsoft.PowerFx.Types.ITypeVistor", + "Microsoft.PowerFx.Types.NamedFormulaType", + "Microsoft.PowerFx.Types.NumberType", + "Microsoft.PowerFx.Types.OptionSetValueType", + "Microsoft.PowerFx.Types.RecordType", + "Microsoft.PowerFx.Types.StringType", + "Microsoft.PowerFx.Types.TableType", + "Microsoft.PowerFx.Types.TimeType", + "Microsoft.PowerFx.Types.BindingErrorType", + "Microsoft.PowerFx.Types.UnknownType", + "Microsoft.PowerFx.Types.UntypedObjectType", + "Microsoft.PowerFx.Types.BlankValue", + "Microsoft.PowerFx.Types.BooleanValue", + "Microsoft.PowerFx.Types.ColorValue", + "Microsoft.PowerFx.Types.DValue`1", + "Microsoft.PowerFx.Types.DateTimeValue", + "Microsoft.PowerFx.Types.DateValue", + "Microsoft.PowerFx.Types.ErrorValue", + "Microsoft.PowerFx.Types.FormulaValue", + "Microsoft.PowerFx.Types.GuidValue", + "Microsoft.PowerFx.Types.IUntypedObject", + "Microsoft.PowerFx.Types.IValueVisitor", + "Microsoft.PowerFx.Types.NamedValue", + "Microsoft.PowerFx.Types.NumberValue", + "Microsoft.PowerFx.Types.OptionSetValue", + "Microsoft.PowerFx.Types.PrimitiveValue`1", + "Microsoft.PowerFx.Types.RecordValue", + "Microsoft.PowerFx.Types.StringValue", + "Microsoft.PowerFx.Types.TableValue", + "Microsoft.PowerFx.Types.TimeValue", + "Microsoft.PowerFx.Types.UntypedObjectValue", + "Microsoft.PowerFx.Types.ValidFormulaValue", + + // Intellisense classes. Used primarily by the Language Service Provider. + // Most evaluators should never need htese. + "Microsoft.PowerFx.Intellisense.IPowerFxScope", + "Microsoft.PowerFx.Intellisense.IPowerFxScopeDisplayName", + "Microsoft.PowerFx.Intellisense.IIntellisenseResult", + "Microsoft.PowerFx.Intellisense.IIntellisenseSuggestion", + "Microsoft.PowerFx.Intellisense.SignatureHelp.ParameterInformation", + "Microsoft.PowerFx.Intellisense.SignatureHelp.SignatureHelp", + "Microsoft.PowerFx.Intellisense.SignatureHelp.SignatureInformation", + "Microsoft.PowerFx.Intellisense.SuggestionIconKind", + "Microsoft.PowerFx.Intellisense.SuggestionKind", + "Microsoft.PowerFx.Intellisense.UIString", + "Microsoft.PowerFx.Intellisense.TokenResultType", + + // TBD ... + "Microsoft.PowerFx.Core.RenameDriver", "Microsoft.PowerFx.Core.App.DefaultEnabledFeatures", "Microsoft.PowerFx.Core.App.IExternalEnabledFeatures", "Microsoft.PowerFx.Core.BuiltinFormulaTypeConversions", "Microsoft.PowerFx.Core.DisplayNameUtility", - "Microsoft.PowerFx.Core.Errors.DocumentErrorSeverity", "Microsoft.PowerFx.Core.FormulaTypeSchema", - "Microsoft.PowerFx.Core.FormulaTypeToSchemaConverter", - "Microsoft.PowerFx.Core.Lexer.BinaryOp", - "Microsoft.PowerFx.Core.Lexer.TokKind", - "Microsoft.PowerFx.Core.Lexer.Tokens.CommentToken", - "Microsoft.PowerFx.Core.Lexer.Tokens.ErrorToken", - "Microsoft.PowerFx.Core.Lexer.Tokens.IdentToken", - "Microsoft.PowerFx.Core.Lexer.Tokens.NumLitToken", - "Microsoft.PowerFx.Core.Lexer.Tokens.StrLitToken", - "Microsoft.PowerFx.Core.Lexer.Tokens.Token", - "Microsoft.PowerFx.Core.Lexer.UnaryOp", - "Microsoft.PowerFx.Core.Lexer.VariadicOp", - "Microsoft.PowerFx.Core.Localization.ErrorResourceKey", - "Microsoft.PowerFx.Core.Localization.Span", - "Microsoft.PowerFx.Core.NameCollisionException", - "Microsoft.PowerFx.Core.Parser.ParseResult", - "Microsoft.PowerFx.Core.PowerFxConfig", - "Microsoft.PowerFx.Core.Public.FunctionInfo", - "Microsoft.PowerFx.Core.Public.CheckResult", - "Microsoft.PowerFx.Core.Public.ErrorKind", - "Microsoft.PowerFx.Core.Public.ExpressionError", - "Microsoft.PowerFx.Core.Public.FormulaWithParameters", - "Microsoft.PowerFx.Core.Public.IExpression", - "Microsoft.PowerFx.Core.Public.IExpressionExtensions", - "Microsoft.PowerFx.Core.Public.IPowerFxEngine", - "Microsoft.PowerFx.Core.Public.IPowerFxScope", - "Microsoft.PowerFx.Core.Public.IPowerFxScopeDisplayName", - "Microsoft.PowerFx.Core.Public.ParserOptions", - "Microsoft.PowerFx.Core.Public.TokenResultType", - "Microsoft.PowerFx.Core.Public.Types.AggregateType", - "Microsoft.PowerFx.Core.Public.Types.BlankType", - "Microsoft.PowerFx.Core.Public.Types.BooleanType", - "Microsoft.PowerFx.Core.Public.Types.ColorType", - "Microsoft.PowerFx.Core.Public.Types.DateTimeNoTimeZoneType", - "Microsoft.PowerFx.Core.Public.Types.DateTimeType", - "Microsoft.PowerFx.Core.Public.Types.DateType", - "Microsoft.PowerFx.Core.Public.Types.ExternalType", - "Microsoft.PowerFx.Core.Public.Types.ExternalTypeKind", - "Microsoft.PowerFx.Core.Public.Types.FormulaType", - "Microsoft.PowerFx.Core.Public.Types.GuidType", - "Microsoft.PowerFx.Core.Public.Types.HyperlinkType", - "Microsoft.PowerFx.Core.Public.Types.ITypeVistor", - "Microsoft.PowerFx.Core.Public.Types.NamedFormulaType", - "Microsoft.PowerFx.Core.Public.Types.NumberType", - "Microsoft.PowerFx.Core.Public.Types.OptionSetValueType", - "Microsoft.PowerFx.Core.Public.Types.RecordType", - "Microsoft.PowerFx.Core.Public.Types.StringType", - "Microsoft.PowerFx.Core.Public.Types.TableType", - "Microsoft.PowerFx.Core.Public.Types.TimeType", - "Microsoft.PowerFx.Core.Public.Types.BindingErrorType", - "Microsoft.PowerFx.Core.Public.Types.UnknownType", - "Microsoft.PowerFx.Core.Public.Types.UntypedObjectType", - "Microsoft.PowerFx.Core.Public.Values.BlankValue", - "Microsoft.PowerFx.Core.Public.Values.BooleanValue", - "Microsoft.PowerFx.Core.Public.Values.ColorValue", - "Microsoft.PowerFx.Core.Public.Values.DValue`1", - "Microsoft.PowerFx.Core.Public.Values.DateTimeValue", - "Microsoft.PowerFx.Core.Public.Values.DateValue", - "Microsoft.PowerFx.Core.Public.Values.ErrorValue", - "Microsoft.PowerFx.Core.Public.Values.FormulaValue", - "Microsoft.PowerFx.Core.Public.Values.GuidValue", - "Microsoft.PowerFx.Core.Public.Values.IUntypedObject", - "Microsoft.PowerFx.Core.Public.Values.IValueVisitor", - "Microsoft.PowerFx.Core.Public.Values.NamedValue", - "Microsoft.PowerFx.Core.Public.Values.NumberValue", - "Microsoft.PowerFx.Core.Public.Values.OptionSetValue", - "Microsoft.PowerFx.Core.Public.Values.PrimitiveValue`1", - "Microsoft.PowerFx.Core.Public.Values.RecordValue", - "Microsoft.PowerFx.Core.Public.Values.StringValue", - "Microsoft.PowerFx.Core.Public.Values.TableValue", - "Microsoft.PowerFx.Core.Public.Values.TimeValue", - "Microsoft.PowerFx.Core.Public.Values.UntypedObjectValue", - "Microsoft.PowerFx.Core.Public.Values.ValidFormulaValue", - "Microsoft.PowerFx.Core.RenameDriver", - "Microsoft.PowerFx.Core.Syntax.Identifier", - "Microsoft.PowerFx.Core.Syntax.NodeKind", - "Microsoft.PowerFx.Core.Syntax.Nodes.AsNode", - "Microsoft.PowerFx.Core.Syntax.Nodes.BinaryOpNode", - "Microsoft.PowerFx.Core.Syntax.Nodes.BlankNode", - "Microsoft.PowerFx.Core.Syntax.Nodes.BoolLitNode", - "Microsoft.PowerFx.Core.Syntax.Nodes.CallNode", - "Microsoft.PowerFx.Core.Syntax.Nodes.DottedNameNode", - "Microsoft.PowerFx.Core.Syntax.Nodes.ErrorNode", - "Microsoft.PowerFx.Core.Syntax.Nodes.FirstNameNode", - "Microsoft.PowerFx.Core.Syntax.Nodes.ListNode", - "Microsoft.PowerFx.Core.Syntax.Nodes.NameNode", - "Microsoft.PowerFx.Core.Syntax.Nodes.NumLitNode", - "Microsoft.PowerFx.Core.Syntax.Nodes.ParentNode", - "Microsoft.PowerFx.Core.Syntax.Nodes.RecordNode", - "Microsoft.PowerFx.Core.Syntax.Nodes.SelfNode", - "Microsoft.PowerFx.Core.Syntax.Nodes.StrInterpNode", - "Microsoft.PowerFx.Core.Syntax.Nodes.StrLitNode", - "Microsoft.PowerFx.Core.Syntax.Nodes.TableNode", - "Microsoft.PowerFx.Core.Syntax.Nodes.TexlNode", - "Microsoft.PowerFx.Core.Syntax.Nodes.UnaryOpNode", - "Microsoft.PowerFx.Core.Syntax.Nodes.VariadicBase", - "Microsoft.PowerFx.Core.Syntax.Nodes.VariadicOpNode", - "Microsoft.PowerFx.Core.Syntax.Visitors.IdentityTexlVisitor", - "Microsoft.PowerFx.Core.Syntax.Visitors.TexlFunctionalVisitor`2", - "Microsoft.PowerFx.Core.Syntax.Visitors.TexlVisitor", - "Microsoft.PowerFx.Core.Texl.Intellisense.IIntellisenseResult", - "Microsoft.PowerFx.Core.Texl.Intellisense.IIntellisenseSuggestion", - "Microsoft.PowerFx.Core.Texl.Intellisense.SignatureHelp.ParameterInformation", - "Microsoft.PowerFx.Core.Texl.Intellisense.SignatureHelp.SignatureHelp", - "Microsoft.PowerFx.Core.Texl.Intellisense.SignatureHelp.SignatureInformation", - "Microsoft.PowerFx.Core.Texl.Intellisense.SuggestionIconKind", - "Microsoft.PowerFx.Core.Texl.Intellisense.SuggestionKind", - "Microsoft.PowerFx.Core.Texl.Intellisense.UIString", + "Microsoft.PowerFx.Core.FormulaTypeToSchemaConverter", "Microsoft.PowerFx.Core.Utils.DName", "Microsoft.PowerFx.Core.Utils.DPath", "Microsoft.PowerFx.Core.Utils.ICheckable", - "Microsoft.PowerFx.Engine", - "Microsoft.PowerFx.FeatureFlags", + "Microsoft.PowerFx.Core.Localization.ErrorResourceKey", + "Microsoft.PowerFx.Core.Localization.Span", }; var sb = new StringBuilder(); @@ -161,6 +183,52 @@ public void Test() Assert.Empty(allowed); } + // No public type with TransportType attribute + // TransportType is special to Canvas Documents and a tool reflects over it + // and it's very brittle. + [Fact] + public void NoTransportInPublicTypes() + { + var exceptionList = new HashSet() + { + "Microsoft.PowerFx.Core.Localization.Span" + }; + + var asm = typeof(Parser.TexlParser).Assembly; + foreach (var type in asm.GetTypes().Where(t => t.IsPublic)) + { + if (exceptionList.Contains(type.FullName)) + { + continue; + } + + var attrs = type.GetCustomAttributesData(); + + var hasTransport = attrs.Any(attr => attr.AttributeType.Namespace.StartsWith("Microsoft.AppMagic.Transport")); + Assert.False(hasTransport, $"Types '{type.FullName}' with Transport attribute shouldn't be public."); + } + } + + // Assert DocumentErrorSeverity and ErrorSeverity are in sync. + [Fact] + public void ErrorSeverityEnumsMatch() + { + var values1 = Enum.GetValues(typeof(Errors.DocumentErrorSeverity)); + var values2 = Enum.GetValues(typeof(ErrorSeverity)); + + var len = values1.Length; + Assert.Equal(len, values2.Length); + + for (var i = 0; i < len; i++) + { + var x = values1.GetValue(i); + var y = values1.GetValue(i); + + Assert.Equal((int)x, (int)y); + Assert.Equal(x.ToString(), y.ToString()); + } + } + [Fact] public void TestTexlNodeTypes() => TestPublicClassHierarchy(typeof(TexlNode)); @@ -216,7 +284,7 @@ private static void TestPublicClassHierarchy(Type rootType, bool requireAbstract [Fact] public static void TestImmutability() { - var asm = typeof(Syntax.Nodes.TexlNode).Assembly; + var asm = typeof(Microsoft.PowerFx.Syntax.TexlNode).Assembly; ImmutabilityTests.CheckImmutability(asm); } diff --git a/src/tests/Microsoft.PowerFx.Core.Tests/TestRunnerTests/TestRunnerTests.cs b/src/tests/Microsoft.PowerFx.Core.Tests/TestRunnerTests/TestRunnerTests.cs index b4f8bd084b..0e35864808 100644 --- a/src/tests/Microsoft.PowerFx.Core.Tests/TestRunnerTests/TestRunnerTests.cs +++ b/src/tests/Microsoft.PowerFx.Core.Tests/TestRunnerTests/TestRunnerTests.cs @@ -5,7 +5,7 @@ using System.IO; using System.Linq; using System.Threading.Tasks; -using Microsoft.PowerFx.Core.Public.Values; +using Microsoft.PowerFx.Types; using Xunit; namespace Microsoft.PowerFx.Core.Tests @@ -174,7 +174,7 @@ public void TestDisable() Assert.Equal("filedisable.txt:input3", tests[0].GetUniqueId(null)); } - private static readonly ErrorValue _errorValue = new ErrorValue(IR.IRContext.NotInSource(Public.Types.FormulaType.Number)); + private static readonly ErrorValue _errorValue = new ErrorValue(IR.IRContext.NotInSource(FormulaType.Number)); private class MockRunner : BaseRunner { @@ -338,8 +338,8 @@ public async Task TestRunnerError() public async Task TestRunnerErrorKindMatching() { var errorValue = new ErrorValue( - IR.IRContext.NotInSource(Public.Types.FormulaType.Number), - new Public.ExpressionError { Kind = Public.ErrorKind.InvalidFunctionUsage }); + IR.IRContext.NotInSource(FormulaType.Number), + new ExpressionError { Kind = ErrorKind.InvalidFunctionUsage }); var runner = new MockRunner { _hook = (expr, setup) => errorValue // error diff --git a/src/tests/Microsoft.PowerFx.Core.Tests/ThreadingTests.cs b/src/tests/Microsoft.PowerFx.Core.Tests/ThreadingTests.cs index 299c4443a3..bb479975e3 100644 --- a/src/tests/Microsoft.PowerFx.Core.Tests/ThreadingTests.cs +++ b/src/tests/Microsoft.PowerFx.Core.Tests/ThreadingTests.cs @@ -13,7 +13,7 @@ public class ThreadingTests : PowerFxTest [Fact] public void CheckFxCore() { - var asm = typeof(Core.Syntax.Nodes.TexlNode).Assembly; + var asm = typeof(Microsoft.PowerFx.Syntax.TexlNode).Assembly; var bugsFieldType = new HashSet { diff --git a/src/tests/Microsoft.PowerFx.Core.Tests/TypeTests.cs b/src/tests/Microsoft.PowerFx.Core.Tests/TypeTests.cs index 8e5f168352..3d90a1ba78 100644 --- a/src/tests/Microsoft.PowerFx.Core.Tests/TypeTests.cs +++ b/src/tests/Microsoft.PowerFx.Core.Tests/TypeTests.cs @@ -1,11 +1,7 @@ // Copyright (c) Microsoft Corporation. // Licensed under the MIT license. -using System.Collections; -using System.IO; -using System.Linq; -using System.Text.Json; -using Microsoft.PowerFx.Core.Public.Types; +using Microsoft.PowerFx.Types; using Xunit; namespace Microsoft.PowerFx.Tests diff --git a/src/tests/Microsoft.PowerFx.Interpreter.Tests/CustomFunctions.cs b/src/tests/Microsoft.PowerFx.Interpreter.Tests/CustomFunctions.cs index 1a806f4f2b..9249526ae5 100644 --- a/src/tests/Microsoft.PowerFx.Interpreter.Tests/CustomFunctions.cs +++ b/src/tests/Microsoft.PowerFx.Interpreter.Tests/CustomFunctions.cs @@ -1,22 +1,10 @@ // Copyright (c) Microsoft Corporation. // Licensed under the MIT license. -using System; -using System.Collections.Generic; using System.Linq; -using System.Text; -using System.Threading.Tasks; -using Microsoft.PowerFx.Core; -using Microsoft.PowerFx.Core.Functions; -using Microsoft.PowerFx.Core.Public; -using Microsoft.PowerFx.Core.Public.Types; -using Microsoft.PowerFx.Core.Public.Values; using Microsoft.PowerFx.Core.Tests; -using Microsoft.PowerFx.Core.Texl; -using Microsoft.PowerFx.Core.Types.Enums; -using Microsoft.PowerFx.Core.Utils; +using Microsoft.PowerFx.Types; using Xunit; -using Xunit.Sdk; namespace Microsoft.PowerFx.Tests { diff --git a/src/tests/Microsoft.PowerFx.Interpreter.Tests/DependencyVisitorTests.cs b/src/tests/Microsoft.PowerFx.Interpreter.Tests/DependencyVisitorTests.cs index abff8161d9..6f7de28027 100644 --- a/src/tests/Microsoft.PowerFx.Interpreter.Tests/DependencyVisitorTests.cs +++ b/src/tests/Microsoft.PowerFx.Interpreter.Tests/DependencyVisitorTests.cs @@ -2,8 +2,8 @@ // Licensed under the MIT license. using System.Linq; -using Microsoft.PowerFx.Core.Public.Types; using Microsoft.PowerFx.Core.Tests; +using Microsoft.PowerFx.Types; using Xunit; namespace Microsoft.PowerFx.Tests diff --git a/src/tests/Microsoft.PowerFx.Interpreter.Tests/DisplayNameOptionSetTests.cs b/src/tests/Microsoft.PowerFx.Interpreter.Tests/DisplayNameOptionSetTests.cs index 325ded11d9..e5fba79c54 100644 --- a/src/tests/Microsoft.PowerFx.Interpreter.Tests/DisplayNameOptionSetTests.cs +++ b/src/tests/Microsoft.PowerFx.Interpreter.Tests/DisplayNameOptionSetTests.cs @@ -4,9 +4,9 @@ using System.Collections.Generic; using System.Linq; using Microsoft.PowerFx.Core; -using Microsoft.PowerFx.Core.Public.Types; using Microsoft.PowerFx.Core.Tests; using Microsoft.PowerFx.Core.Utils; +using Microsoft.PowerFx.Types; using Xunit; namespace Microsoft.PowerFx.Interpreter.Tests diff --git a/src/tests/Microsoft.PowerFx.Interpreter.Tests/FunctionCompilationTests.cs b/src/tests/Microsoft.PowerFx.Interpreter.Tests/FunctionCompilationTests.cs index beef1bb870..93f89c0cf3 100644 --- a/src/tests/Microsoft.PowerFx.Interpreter.Tests/FunctionCompilationTests.cs +++ b/src/tests/Microsoft.PowerFx.Interpreter.Tests/FunctionCompilationTests.cs @@ -1,8 +1,8 @@ // Copyright (c) Microsoft Corporation. // Licensed under the MIT license. -using Microsoft.PowerFx.Core.Public.Types; using Microsoft.PowerFx.Core.Tests; +using Microsoft.PowerFx.Types; using Xunit; namespace Microsoft.PowerFx.Tests diff --git a/src/tests/Microsoft.PowerFx.Interpreter.Tests/GetTokensUtilsTest.cs b/src/tests/Microsoft.PowerFx.Interpreter.Tests/GetTokensUtilsTest.cs index f4b0a5429a..6779617c71 100644 --- a/src/tests/Microsoft.PowerFx.Interpreter.Tests/GetTokensUtilsTest.cs +++ b/src/tests/Microsoft.PowerFx.Interpreter.Tests/GetTokensUtilsTest.cs @@ -6,6 +6,7 @@ using Microsoft.PowerFx.Core.Public; using Microsoft.PowerFx.Core.Tests; using Microsoft.PowerFx.Core.Utils; +using Microsoft.PowerFx.Intellisense; using Xunit; namespace Microsoft.PowerFx.Tests diff --git a/src/tests/Microsoft.PowerFx.Interpreter.Tests/Helpers/AsyncFunctionHelperBase.cs b/src/tests/Microsoft.PowerFx.Interpreter.Tests/Helpers/AsyncFunctionHelperBase.cs index 95134d0dc7..a9f973f6d3 100644 --- a/src/tests/Microsoft.PowerFx.Interpreter.Tests/Helpers/AsyncFunctionHelperBase.cs +++ b/src/tests/Microsoft.PowerFx.Interpreter.Tests/Helpers/AsyncFunctionHelperBase.cs @@ -1,17 +1,14 @@ // Copyright (c) Microsoft Corporation. // Licensed under the MIT license. -using System; using System.Collections.Generic; -using System.Diagnostics; using System.Linq; using System.Threading; using System.Threading.Tasks; using Microsoft.PowerFx.Core.Functions; -using Microsoft.PowerFx.Core.Public.Values; using Microsoft.PowerFx.Core.Types; using Microsoft.PowerFx.Core.Utils; -using Xunit; +using Microsoft.PowerFx.Types; namespace Microsoft.PowerFx.Tests { diff --git a/src/tests/Microsoft.PowerFx.Interpreter.Tests/Helpers/AsyncVerify.cs b/src/tests/Microsoft.PowerFx.Interpreter.Tests/Helpers/AsyncVerify.cs index 9f67647d16..cbfb925fe0 100644 --- a/src/tests/Microsoft.PowerFx.Interpreter.Tests/Helpers/AsyncVerify.cs +++ b/src/tests/Microsoft.PowerFx.Interpreter.Tests/Helpers/AsyncVerify.cs @@ -7,8 +7,7 @@ using System.Linq; using System.Threading; using System.Threading.Tasks; -using Microsoft.PowerFx.Core.Public; -using Microsoft.PowerFx.Core.Public.Values; +using Microsoft.PowerFx.Types; using Xunit; namespace Microsoft.PowerFx.Tests diff --git a/src/tests/Microsoft.PowerFx.Interpreter.Tests/InterpreterSuggestTests.cs b/src/tests/Microsoft.PowerFx.Interpreter.Tests/InterpreterSuggestTests.cs index f34583ff65..03527ae439 100644 --- a/src/tests/Microsoft.PowerFx.Interpreter.Tests/InterpreterSuggestTests.cs +++ b/src/tests/Microsoft.PowerFx.Interpreter.Tests/InterpreterSuggestTests.cs @@ -5,9 +5,9 @@ using System.Linq; using Microsoft.PowerFx.Core; using Microsoft.PowerFx.Core.Functions; -using Microsoft.PowerFx.Core.Public.Types; using Microsoft.PowerFx.Core.Types.Enums; using Microsoft.PowerFx.Tests.IntellisenseTests; +using Microsoft.PowerFx.Types; using Xunit; namespace Microsoft.PowerFx.Interpreter.Tests diff --git a/src/tests/Microsoft.PowerFx.Interpreter.Tests/LanguageServiceProtocol/LanguageServerTests.cs b/src/tests/Microsoft.PowerFx.Interpreter.Tests/LanguageServiceProtocol/LanguageServerTests.cs index ea27c5d342..3131d5400e 100644 --- a/src/tests/Microsoft.PowerFx.Interpreter.Tests/LanguageServiceProtocol/LanguageServerTests.cs +++ b/src/tests/Microsoft.PowerFx.Interpreter.Tests/LanguageServiceProtocol/LanguageServerTests.cs @@ -8,10 +8,11 @@ using System.Text.RegularExpressions; using Microsoft.PowerFx.Core; using Microsoft.PowerFx.Core.Public; -using Microsoft.PowerFx.Core.Public.Types; using Microsoft.PowerFx.Core.Tests; +using Microsoft.PowerFx.Intellisense; using Microsoft.PowerFx.LanguageServerProtocol; using Microsoft.PowerFx.LanguageServerProtocol.Protocol; +using Microsoft.PowerFx.Types; using Xunit; namespace Microsoft.PowerFx.Tests.LanguageServiceProtocol.Tests diff --git a/src/tests/Microsoft.PowerFx.Interpreter.Tests/LanguageServiceProtocol/MockSqlEngine.cs b/src/tests/Microsoft.PowerFx.Interpreter.Tests/LanguageServiceProtocol/MockSqlEngine.cs index 82eaa08d73..2db2867536 100644 --- a/src/tests/Microsoft.PowerFx.Interpreter.Tests/LanguageServiceProtocol/MockSqlEngine.cs +++ b/src/tests/Microsoft.PowerFx.Interpreter.Tests/LanguageServiceProtocol/MockSqlEngine.cs @@ -3,7 +3,7 @@ using Microsoft.PowerFx.Core; using Microsoft.PowerFx.Core.Public; -using Microsoft.PowerFx.Core.Texl.Intellisense; +using Microsoft.PowerFx.Intellisense; using Microsoft.PowerFx.LanguageServerProtocol.Protocol; namespace Microsoft.PowerFx.Tests.LanguageServiceProtocol.Tests diff --git a/src/tests/Microsoft.PowerFx.Interpreter.Tests/LanguageServiceProtocol/TestPowerFxScopeFactory.cs b/src/tests/Microsoft.PowerFx.Interpreter.Tests/LanguageServiceProtocol/TestPowerFxScopeFactory.cs index e3a72dfeb0..a01652ea16 100644 --- a/src/tests/Microsoft.PowerFx.Interpreter.Tests/LanguageServiceProtocol/TestPowerFxScopeFactory.cs +++ b/src/tests/Microsoft.PowerFx.Interpreter.Tests/LanguageServiceProtocol/TestPowerFxScopeFactory.cs @@ -3,6 +3,7 @@ using Microsoft.PowerFx.Core; using Microsoft.PowerFx.Core.Public; +using Microsoft.PowerFx.Intellisense; namespace Microsoft.PowerFx.Tests.LanguageServiceProtocol { diff --git a/src/tests/Microsoft.PowerFx.Interpreter.Tests/MarshalTests.cs b/src/tests/Microsoft.PowerFx.Interpreter.Tests/MarshalTests.cs index 9f46169ace..40e641ae87 100644 --- a/src/tests/Microsoft.PowerFx.Interpreter.Tests/MarshalTests.cs +++ b/src/tests/Microsoft.PowerFx.Interpreter.Tests/MarshalTests.cs @@ -7,10 +7,8 @@ using System.Reflection; using System.Threading; using System.Threading.Tasks; -using Microsoft.PowerFx.Core; -using Microsoft.PowerFx.Core.Public.Types; -using Microsoft.PowerFx.Core.Public.Values; using Microsoft.PowerFx.Core.Tests; +using Microsoft.PowerFx.Types; using Xunit; namespace Microsoft.PowerFx.Tests diff --git a/src/tests/Microsoft.PowerFx.Interpreter.Tests/PowerFxEvaluationTests.cs b/src/tests/Microsoft.PowerFx.Interpreter.Tests/PowerFxEvaluationTests.cs index 1b265c7689..63d6a14d25 100644 --- a/src/tests/Microsoft.PowerFx.Interpreter.Tests/PowerFxEvaluationTests.cs +++ b/src/tests/Microsoft.PowerFx.Interpreter.Tests/PowerFxEvaluationTests.cs @@ -7,12 +7,10 @@ using System.Threading.Tasks; using Microsoft.PowerFx.Core; using Microsoft.PowerFx.Core.Parser; -using Microsoft.PowerFx.Core.Public; -using Microsoft.PowerFx.Core.Public.Values; using Microsoft.PowerFx.Core.Tests; using Microsoft.PowerFx.Core.Utils; using Microsoft.PowerFx.Tests; -using Xunit; +using Microsoft.PowerFx.Types; namespace Microsoft.PowerFx.Interpreter.Tests { @@ -80,7 +78,7 @@ private async Task RunVerifyAsync(string expr, ParserOptions optio protected override async Task RunAsyncInternal(string expr, string setupHandlerName) { - FeatureFlags.StringInterpolation = true; + Preview.FeatureFlags.StringInterpolation = true; RecalcEngine engine; RecordValue parameters; var iSetup = InternalSetup.Parse(setupHandlerName); diff --git a/src/tests/Microsoft.PowerFx.Interpreter.Tests/PrimitiveTests.cs b/src/tests/Microsoft.PowerFx.Interpreter.Tests/PrimitiveTests.cs index 5a8fb99bf8..085f1d25d5 100644 --- a/src/tests/Microsoft.PowerFx.Interpreter.Tests/PrimitiveTests.cs +++ b/src/tests/Microsoft.PowerFx.Interpreter.Tests/PrimitiveTests.cs @@ -2,14 +2,11 @@ // Licensed under the MIT license. using System; -using System.Collections; -using System.Linq; -using Microsoft.PowerFx.Core.Public.Types; -using Microsoft.PowerFx.Core.Public.Values; +using Microsoft.PowerFx.Types; using Xunit; namespace Microsoft.PowerFx.Core.Tests -{ +{ public class PrimitiveTests { private static readonly TypeMarshallerCache _cache = new TypeMarshallerCache(); diff --git a/src/tests/Microsoft.PowerFx.Interpreter.Tests/RecalcEngineAsyncTests.cs b/src/tests/Microsoft.PowerFx.Interpreter.Tests/RecalcEngineAsyncTests.cs index b76d1a8b73..0cbd59ad6c 100644 --- a/src/tests/Microsoft.PowerFx.Interpreter.Tests/RecalcEngineAsyncTests.cs +++ b/src/tests/Microsoft.PowerFx.Interpreter.Tests/RecalcEngineAsyncTests.cs @@ -5,14 +5,12 @@ using System.Collections.Generic; using System.Threading; using System.Threading.Tasks; -using Microsoft.PowerFx.Core; using Microsoft.PowerFx.Core.Functions; using Microsoft.PowerFx.Core.Localization; -using Microsoft.PowerFx.Core.Public.Types; -using Microsoft.PowerFx.Core.Public.Values; using Microsoft.PowerFx.Core.Tests; using Microsoft.PowerFx.Core.Types; using Microsoft.PowerFx.Core.Utils; +using Microsoft.PowerFx.Types; using Xunit; using static Microsoft.PowerFx.Core.Localization.TexlStrings; diff --git a/src/tests/Microsoft.PowerFx.Interpreter.Tests/RecalcEngineTests.cs b/src/tests/Microsoft.PowerFx.Interpreter.Tests/RecalcEngineTests.cs index c436a0a47f..a2bcb42e6c 100644 --- a/src/tests/Microsoft.PowerFx.Interpreter.Tests/RecalcEngineTests.cs +++ b/src/tests/Microsoft.PowerFx.Interpreter.Tests/RecalcEngineTests.cs @@ -8,13 +8,11 @@ using System.Threading.Tasks; using Microsoft.PowerFx.Core; using Microsoft.PowerFx.Core.Functions; -using Microsoft.PowerFx.Core.Public; -using Microsoft.PowerFx.Core.Public.Types; -using Microsoft.PowerFx.Core.Public.Values; using Microsoft.PowerFx.Core.Tests; using Microsoft.PowerFx.Core.Texl; using Microsoft.PowerFx.Core.Types.Enums; using Microsoft.PowerFx.Core.Utils; +using Microsoft.PowerFx.Types; using Xunit; using Xunit.Sdk; @@ -28,6 +26,7 @@ public void PublicSurfaceTests() var asm = typeof(RecalcEngine).Assembly; var ns = "Microsoft.PowerFx"; + var nsType = "Microsoft.PowerFx.Types"; var allowed = new HashSet() { $"{ns}.{nameof(RecalcEngine)}", @@ -35,7 +34,6 @@ public void PublicSurfaceTests() $"{ns}.{nameof(RecalcEngineScope)}", $"{ns}.{nameof(PowerFxConfigExtensions)}", $"{ns}.{nameof(OptionSet)}", - $"{ns}.{nameof(ObjectRecordValue)}", $"{ns}.{nameof(ITypeMarshallerProvider)}", $"{ns}.{nameof(ITypeMarshaller)}", $"{ns}.{nameof(OptionSet)}", @@ -45,7 +43,8 @@ public void PublicSurfaceTests() $"{ns}.{nameof(PrimitiveTypeMarshaller)}", $"{ns}.{nameof(TableMarshallerProvider)}", $"{ns}.{nameof(TypeMarshallerCache)}", - $"{ns}.{nameof(TypeMarshallerCacheExtensions)}" + $"{ns}.{nameof(TypeMarshallerCacheExtensions)}", + $"{nsType}.{nameof(ObjectRecordValue)}" }; var sb = new StringBuilder(); @@ -322,7 +321,7 @@ public void CheckSuccessWarning() var result = engine.Check("Filter([1,2,3],true)"); Assert.True(result.IsSuccess); - Assert.Equal(1, result.Errors.Count(x => x.Severity == Core.Errors.DocumentErrorSeverity.Warning)); + Assert.Equal(1, result.Errors.Count(x => x.Severity == ErrorSeverity.Warning)); Assert.NotNull(result.Expression); } diff --git a/src/tests/Microsoft.PowerFx.Interpreter.Tests/Scenarios/ScenarioCustomMarshaler.cs b/src/tests/Microsoft.PowerFx.Interpreter.Tests/Scenarios/ScenarioCustomMarshaler.cs index d175c39a43..e7c1aae29a 100644 --- a/src/tests/Microsoft.PowerFx.Interpreter.Tests/Scenarios/ScenarioCustomMarshaler.cs +++ b/src/tests/Microsoft.PowerFx.Interpreter.Tests/Scenarios/ScenarioCustomMarshaler.cs @@ -3,8 +3,8 @@ using System.ComponentModel; using System.Reflection; -using Microsoft.PowerFx.Core.Public.Values; using Microsoft.PowerFx.Core.Tests; +using Microsoft.PowerFx.Types; using Xunit; namespace Microsoft.PowerFx.Interpreter.Tests diff --git a/src/tests/Microsoft.PowerFx.Interpreter.Tests/Scenarios/ScenarioDotNetObjectWrapper.cs b/src/tests/Microsoft.PowerFx.Interpreter.Tests/Scenarios/ScenarioDotNetObjectWrapper.cs index f2e8fd59fc..5ab15089d4 100644 --- a/src/tests/Microsoft.PowerFx.Interpreter.Tests/Scenarios/ScenarioDotNetObjectWrapper.cs +++ b/src/tests/Microsoft.PowerFx.Interpreter.Tests/Scenarios/ScenarioDotNetObjectWrapper.cs @@ -4,9 +4,8 @@ using System; using System.Diagnostics; using System.Reflection; -using Microsoft.PowerFx.Core.Public.Types; -using Microsoft.PowerFx.Core.Public.Values; using Microsoft.PowerFx.Core.Tests; +using Microsoft.PowerFx.Types; using Xunit; namespace Microsoft.PowerFx.Interpreter.Tests diff --git a/src/tests/Microsoft.PowerFx.Interpreter.Tests/Scenarios/ScenarioMutation.cs b/src/tests/Microsoft.PowerFx.Interpreter.Tests/Scenarios/ScenarioMutation.cs index 89bcc247d9..94d80d1be1 100644 --- a/src/tests/Microsoft.PowerFx.Interpreter.Tests/Scenarios/ScenarioMutation.cs +++ b/src/tests/Microsoft.PowerFx.Interpreter.Tests/Scenarios/ScenarioMutation.cs @@ -3,14 +3,9 @@ using System; using System.Collections.Generic; -using System.Threading.Tasks; -using Microsoft.PowerFx.Core; using Microsoft.PowerFx.Core.IR; -using Microsoft.PowerFx.Core.Public; -using Microsoft.PowerFx.Core.Public.Types; -using Microsoft.PowerFx.Core.Public.Values; using Microsoft.PowerFx.Core.Tests; -using Microsoft.PowerFx.Tests; +using Microsoft.PowerFx.Types; using Xunit; using Xunit.Sdk; diff --git a/src/tests/Microsoft.PowerFx.Interpreter.Tests/TimeTests.cs b/src/tests/Microsoft.PowerFx.Interpreter.Tests/TimeTests.cs index 56d8235126..5543b4a001 100644 --- a/src/tests/Microsoft.PowerFx.Interpreter.Tests/TimeTests.cs +++ b/src/tests/Microsoft.PowerFx.Interpreter.Tests/TimeTests.cs @@ -2,8 +2,8 @@ // Licensed under the MIT license. using System; -using Microsoft.PowerFx.Core.Public.Values; using Microsoft.PowerFx.Core.Tests; +using Microsoft.PowerFx.Types; using Xunit; namespace Microsoft.PowerFx.Interpreter.Tests diff --git a/src/tests/Microsoft.PowerFx.Interpreter.Tests/ValueTests.cs b/src/tests/Microsoft.PowerFx.Interpreter.Tests/ValueTests.cs index d50625b4bd..258854d0f1 100644 --- a/src/tests/Microsoft.PowerFx.Interpreter.Tests/ValueTests.cs +++ b/src/tests/Microsoft.PowerFx.Interpreter.Tests/ValueTests.cs @@ -3,10 +3,8 @@ using System; using System.Collections; -using System.Collections.Generic; using System.Linq; -using Microsoft.PowerFx.Core.Public.Types; -using Microsoft.PowerFx.Core.Public.Values; +using Microsoft.PowerFx.Types; using Xunit; // Need to test against some poorly formed classes that violate StyleCop rules.