Merge pull request #518 from github/bump-semantic-source

Bump semantic-source

.github/workflows/haskell.yml

@@ -31,19 +31,19 @@ jobs:
       name: Cache ~/.cabal/packages
       with:
         path: ~/.cabal/packages
-        key: ${{ runner.os }}-${{ matrix.ghc }}-cabal-packages
+        key: ${{ runner.os }}-${{ matrix.ghc }}-v1-cabal-packages
 
     - uses: actions/cache@v1
       name: Cache ~/.cabal/store
       with:
         path: ~/.cabal/store
-        key: ${{ runner.os }}-${{ matrix.ghc }}-v10-cabal-store
+        key: ${{ runner.os }}-${{ matrix.ghc }}-v11-cabal-store
 
     - uses: actions/cache@v1
       name: Cache dist-newstyle
       with:
         path: dist-newstyle
-        key: ${{ runner.os }}-${{ matrix.ghc }}-${{ matrix.cabal }}-semantic-dist
+        key: ${{ runner.os }}-${{ matrix.ghc }}-${{ matrix.cabal }}-v1-semantic-dist
 
     # - name: hlint
     #   run: |

README.md

@@ -82,12 +82,13 @@ Available options:
 | 3        | TypeScript     | ✅     | ✅     | ✅    | ✅  | ✅      | ✅          | 🚧  | |
 | 4        | Python         | ✅     | ✅     | ✅    | ✅  | ✅      | ✅           | 🚧 | |
 | 5        | Go             | ✅     | ✅     | ✅    | ✅  | ✅      | ✅           | 🚧 | |
-|          | PHP            | 🚧     | 🚧   | 🚧  | 🚧| 🚧    | | | |
+|          | PHP            | 🚧     | 🚧     | 🚧    | 🚧  | 🚧      |            | | |
 |          | Java           | 🚧     | N/A    | 🚧    | 🚧  | ✅      |               | | |
 |          | JSON           | ✅     | N/A    | ✅    | N/A | N/A     | N/A          | N/A| |
 |          | JSX            | ✅     | ✅     | ✅    | 🔶  |         |              | | |
 |          | Haskell        | 🚧     | 🚧     | 🚧    | 🔶  | 🚧       |              | | |
 |          | Markdown       | 🚧     | 🚧     | 🚧    | 🚧  | N/A     | N/A          | N/A |   |
+|          | CodeQL         | 🚧     | N/A    | 🚧    | 🚧  | 🚧     |           |  | |
 
 * ✅ — Supported
 * 🔶 — Partial support

script/build-and-upload

@@ -0,0 +1,106 @@
+#!/bin/bash
+
+# Usage: script/build-and-upload PROJECT_NAME
+# where PROJECT_NAME is one of the packages present in this repo:
+# semantic-source, etc.
+
+set -e
+
+PROJECT="$1"
+ROOT_DIR="$(dirname "$0")/.."
+CABAL_PATH="$ROOT_DIR/$PROJECT/$PROJECT.cabal"
+
+if [ -z "$PROJECT" ]
+then echo "USAGE: build_and_upload PROJECT_NAME"; exit 1
+fi
+
+if [ ! -f "$CABAL_PATH" ]
+then echo "Couldn't find .cabal file at $CABAL_PATH; is $PROJECT a valid package?"; exit 1
+fi
+
+set -x
+
+cabal v2-build "$PROJECT"
+TGZ_LOC="$(cabal v2-sdist "$PROJECT" | tail -n 1)"
+DOCS_LOC="$(cabal v2-haddock --haddock-for-hackage "$PROJECT" | tail -n 1)"
+PACKAGE_VERSION="$(basename "$TGZ_LOC" .tar.gz)"
+
+if [ ! -f "$TGZ_LOC" ]
+then echo "Bug in build_and_upload: $PACKAGE_FN doesn't point to a valid path"; exit 1
+fi
+
+set +x
+
+echo "You are planning to upload '$PACKAGE_VERSION'."
+read -rp "Is this correct? [y/n] " choice
+if [ "$choice" != "y" ]
+   then echo "Aborting."; exit 1
+fi
+
+echo "Attempting to build $PACKAGE_VERSION from source"
+TEMP_PATH=$(mktemp -d)
+tar -xvf "$TGZ_LOC" -C "$TEMP_PATH"
+
+set -x
+(
+    cd "$TEMP_PATH/$PACKAGE_VERSION"
+    pwd
+
+    cabal v2-update
+    cabal v2-build --disable-optimization
+)
+set +x
+
+if wget -q --spider "https://hackage.haskell.org/package/$PACKAGE_VERSION"
+then
+    echo "The package $PACKAGE_VERSION already exists on Hackage."
+    echo "If you need to upload code changes, then bump the version number in $PROJECT/$PROJECT.cabal, make a PR, and run this script again."
+    echo "Otherwise, if you need _only_ to loosen existing constraints in $PROJECT.cabal file, then you can create a new revision of this package on Hackage."
+    echo "You'll need to make your changes by hand. Be sure to click the 'Review changes' button to check your work."
+    read -rp "Do you want to open a browser so as to do this? [y/N]" choice
+    if [ "$choice" == "y" ]
+    then
+        echo "Opening…"
+        sleep 1
+        open "https://hackage.haskell.org/package/$PACKAGE_VERSION/$PROJECT.cabal/edit"
+        exit 0
+    else
+        echo "Aborting"
+        exit 1
+    fi
+fi
+
+echo "******************"
+echo "Uploading packages"
+echo "******************"
+
+echo -n "Hackage username: "
+read HACKAGE_USER
+echo
+echo -n "Hackage password: "
+read -s HACKAGE_PASS
+
+cabal upload --username="$HACKAGE_USER" --password="$HACKAGE_PASS" "$TGZ_LOC"
+cabal upload --username="$HACKAGE_USER" --password="$HACKAGE_PASS" --documentation "$DOCS_LOC"
+
+URL="https://hackage.haskell.org/package/$PACKAGE_VERSION/candidate"
+
+echo "Opening candidate URL in browser…"
+sleep 1
+open "$URL"
+
+echo "About to upload final version. Do you want to proceed?"
+echo "Full-fledged package uploads cannot be undone!"
+read -rp "Type 'yes' to continue. " choice
+if [ "$choice" != "yes" ]
+   then echo "Aborting."; exit 1
+fi
+
+set -x
+
+cabal upload --username="$HACKAGE_USER" --password="$HACKAGE_PASS" --publish "$TGZ_LOC"
+cabal upload --username="$HACKAGE_USER" --password="$HACKAGE_PASS" --publish --documentation "$DOCS_LOC"
+
+echo "Tagging $PACKAGE_VERSION"
+git tag "$PACKAGE_VERSION"
+git push --tags

semantic-analysis/semantic-analysis.cabal

@@ -74,7 +74,7 @@ library
     , pathtype                    ^>= 0.8.1
     , prettyprinter                >= 1.2 && < 2
     , prettyprinter-ansi-terminal ^>= 1.1.1
-    , semantic-source             ^>= 0.0.2
+    , semantic-source             ^>= 0.1.0
     , semilattices
     , terminal-size               ^>= 0.3
     , text                        ^>= 1.2.3.1

semantic-analysis/src/Analysis/File.hs

@@ -7,7 +7,6 @@ module Analysis.File
 ) where
 
 import           Data.Maybe (fromJust, listToMaybe)
-import           Data.Semilattice.Lower
 import           GHC.Stack
 import           Source.Language as Language
 import           Source.Span
@@ -30,4 +29,4 @@ fileLanguage :: File a -> Language
 fileLanguage = Language.forPath . filePath
 
 fromPath :: Path.PartClass.AbsRel ar => Path.File ar -> File Language
-fromPath p = File (Path.toAbsRel p) lowerBound (Language.forPath p)
+fromPath p = File (Path.toAbsRel p) (point (Pos 0 0)) (Language.forPath p)

semantic-ast/semantic-ast.cabal

@@ -61,7 +61,7 @@ library
                      , filepath             ^>= 1.4.1
                      , fused-effects        ^>= 1.0
                      , tree-sitter          ^>= 0.9.0.0
-                     , semantic-source      ^>= 0.0.2
+                     , semantic-source      ^>= 0.1.0
                      , template-haskell     ^>= 2.15
                      , bytestring           ^>= 0.10.8.2
                      , optparse-applicative >= 0.14.3 && < 0.16

semantic-core/semantic-core.cabal

@@ -55,7 +55,7 @@ library
     , prettyprinter                >= 1.2.1 && < 2
     , prettyprinter-ansi-terminal ^>= 1.1.1
     , semantic-analysis           ^>= 0
-    , semantic-source             ^>= 0.0.2
+    , semantic-source             ^>= 0.1.0
     , text                        ^>= 1.2.3.1
     , trifecta                     >= 2 && < 2.2
     , unordered-containers        ^>= 0.2.10

semantic-go/semantic-go.cabal

@@ -26,7 +26,7 @@ common haskell
                      , parsers ^>= 0.12.10
                      , semantic-ast
                      , semantic-core ^>= 0.0
-                     , semantic-source ^>= 0.0.2
+                     , semantic-source ^>= 0.1.0
                      , semantic-tags ^>= 0.0
                      , template-haskell ^>= 2.15
                      , text ^>= 1.2.3

semantic-java/semantic-java.cabal

@@ -26,7 +26,7 @@ common haskell
                      , parsers ^>= 0.12.10
                      , semantic-ast
                      , semantic-core ^>= 0.0
-                     , semantic-source ^>= 0.0.2
+                     , semantic-source ^>= 0.1.0
                      , semantic-tags ^>= 0.0
                      , template-haskell ^>= 2.15
                      , text ^>= 1.2.3

semantic-json/semantic-json.cabal

@@ -26,7 +26,7 @@ common haskell
                      , parsers ^>= 0.12.10
                      , semantic-ast
                      , semantic-core ^>= 0.0
-                     , semantic-source ^>= 0.0.2
+                     , semantic-source ^>= 0.1.0
                      , semantic-tags ^>= 0.0
                      , template-haskell ^>= 2.15
                      , text ^>= 1.2.3

semantic-parse/semantic-parse.cabal

@@ -43,7 +43,7 @@ executable semantic-parse
   build-depends:       base
                      , semantic-ast
                      , tree-sitter ^>= 0.9.0.0
-                     , semantic-source
+                     , semantic-source ^>= 0.1.0
                      , tree-sitter-python ^>= 0.9.0.1
                      , bytestring
                      , optparse-applicative

semantic-php/semantic-php.cabal

@@ -26,7 +26,7 @@ common haskell
                      , parsers ^>= 0.12.10
                      , semantic-ast
                      , semantic-core ^>= 0.0
-                     , semantic-source ^>= 0.0.2
+                     , semantic-source ^>= 0.1.0
                      , semantic-tags ^>= 0.0
                      , template-haskell ^>= 2.15
                      , text ^>= 1.2.3

semantic-python/semantic-python.cabal

@@ -27,7 +27,7 @@ common haskell
                      , semantic-analysis ^>= 0
                      , semantic-ast
                      , semantic-core ^>= 0.0
-                     , semantic-source ^>= 0.0.2
+                     , semantic-source ^>= 0.1.0
                      , semantic-tags ^>= 0.0
                      , semantic-scope-graph ^>= 0.0
                      , semilattices ^>= 0

semantic-python/src/Language/Python/ScopeGraph.hs

@@ -33,7 +33,6 @@ import           Data.List.NonEmpty (NonEmpty (..))
 import           Data.Maybe
 import           Data.Monoid
 import qualified Data.ScopeGraph as ScopeGraph
-import           Data.Semilattice.Lower
 import           Data.Traversable
 import           GHC.Records
 import           GHC.TypeLits
@@ -42,7 +41,7 @@ import           Language.Python.Patterns
 import           Scope.Graph.Convert (Result (..), complete, todo)
 import           Scope.Types
 import           Source.Loc (Loc)
-import           Source.Span (Span, span_)
+import           Source.Span (Span, Pos (..), span_, point)
 
 -- This typeclass is internal-only, though it shares the same interface
 -- as the one defined in semantic-scope-graph. The somewhat-unconventional
@@ -197,7 +196,7 @@ instance ToScopeGraph Py.FunctionDefinition where
             { Props.kind = ScopeGraph.Parameter
             , Props.relation = ScopeGraph.Default
             , Props.associatedScope = Nothing
-            , Props.span = lowerBound
+            , Props.span = point (Pos 0 0)
             }
       let param (Py.Parameter (Prj (Py.Identifier pann pname))) = Just (pann, Name.name pname)
           param _                                               = Nothing

semantic-ruby/semantic-ruby.cabal

@@ -26,7 +26,7 @@ common haskell
                      , parsers ^>= 0.12.10
                      , semantic-ast
                      , semantic-core ^>= 0.0
-                     , semantic-source ^>= 0.0.2
+                     , semantic-source ^>= 0.1.0
                      , semantic-tags ^>= 0.0
                      , template-haskell ^>= 2.15
                      , text ^>= 1.2.3

semantic-scope-graph/semantic-scope-graph.cabal

@@ -47,7 +47,7 @@ library
     , lens
     , pathtype
     , semantic-analysis
-    , semantic-source    ^>= 0.0.2
+    , semantic-source    ^>= 0.1.0
     , semilattices
     , text               ^>= 1.2.3.1
   hs-source-dirs:      src

semantic-scope-graph/src/Scope/Info.hs

@@ -37,7 +37,7 @@ instance HasSpan (Info scopeAddress) where
   {-# INLINE span_ #-}
 
 instance Lower (Info scopeAddress) where
-  lowerBound = Info lowerBound lowerBound lowerBound Public lowerBound lowerBound Nothing
+  lowerBound = Info lowerBound lowerBound lowerBound Public (point (Pos 0 0)) lowerBound Nothing
 
 instance AbstractHole (Info address) where
   hole = lowerBound

semantic-source/CHANGELOG.md

@@ -1,3 +1,9 @@
+# 0.1.0.0
+
+- Adds `CodeQL` language constructor.
+- Bumps `lingo-haskell` to 0.3.2.
+- Removes Span and Pos lower bound instances. This makes callers responsible for defining whether Span / Pos are 0 or 1 indexed.
+
 # 0.0.2.0
 
 - Adds `Source.Language`.

semantic-source/semantic-source.cabal

@@ -55,7 +55,7 @@ library
     , containers     ^>= 0.6.2
     , generic-monoid ^>= 0.1.0.0
     , hashable        >= 1.2.7 && < 1.4
-    , lingo          ^>= 0.3
+    , lingo          ^>= 0.3.2.0
     , pathtype       ^>= 0.8.1
     , semilattices   ^>= 0.0.0.3
     , text           ^>= 1.2.3.1

semantic-source/src/Source/Language.hs

@@ -33,11 +33,12 @@ data Language
     | JSON
     | JSX
     | Markdown
+    | PHP
     | Python
     | Ruby
     | TypeScript
-    | PHP
     | TSX
+    | CodeQL
     deriving (Eq, Generic, Ord, Read, Show, Bounded, Hashable, ToJSON, Enum)
 
 -- | Reifies a proxied type-level 'Language' to a value.
@@ -47,6 +48,9 @@ class SLanguage (lang :: Language) where
 instance SLanguage 'Unknown where
   reflect _ = Unknown
 
+instance SLanguage 'CodeQL where
+  reflect _ = CodeQL
+
 instance SLanguage 'Go where
   reflect _ = Go
 
@@ -68,6 +72,9 @@ instance SLanguage 'JSX where
 instance SLanguage 'Markdown where
   reflect _ = Markdown
 
+instance SLanguage 'PHP where
+  reflect _ = PHP
+
 instance SLanguage 'Python where
   reflect _ = Python
 
@@ -77,9 +84,6 @@ instance SLanguage 'Ruby where
 instance SLanguage 'TypeScript where
   reflect _ = TypeScript
 
-instance SLanguage 'PHP where
-  reflect _ = PHP
-
 instance FromJSON Language where
   parseJSON = withText "Language" $ \l ->
     pure $ textToLanguage l
@@ -106,6 +110,7 @@ forPath path =
 languageToText :: Language -> T.Text
 languageToText = \case
   Unknown -> "Unknown"
+  CodeQL -> "CodeQL"
   Go -> "Go"
   Haskell -> "Haskell"
   Java -> "Java"
@@ -113,14 +118,15 @@ languageToText = \case
   JSON -> "JSON"
   JSX -> "JSX"
   Markdown -> "Markdown"
+  PHP -> "PHP"
   Python -> "Python"
   Ruby -> "Ruby"
   TypeScript -> "TypeScript"
   TSX -> "TSX"
-  PHP -> "PHP"
 
 textToLanguage :: T.Text -> Language
 textToLanguage = \case
+  "CodeQL" -> CodeQL
   "Go" -> Go
   "Haskell" -> Haskell
   "Java" -> Java
@@ -128,9 +134,9 @@ textToLanguage = \case
   "JSON" -> JSON
   "JSX" -> JSX
   "Markdown" -> Markdown
+  "PHP" -> PHP
   "Python" -> Python
   "Ruby" -> Ruby
   "TypeScript" -> TypeScript
   "TSX" -> TSX
-  "PHP" -> PHP
   _ -> Unknown

semantic-tags/semantic-tags.cabal

@@ -25,7 +25,7 @@ library
   build-depends:
       base                >= 4.13 && < 5
     , fused-effects      ^>= 1.0
-    , semantic-source    ^>= 0.0.2
+    , semantic-source    ^>= 0.1.0
     , text               ^>= 1.2.3.1
   hs-source-dirs:      src
   default-language:    Haskell2010

semantic-tsx/semantic-tsx.cabal

@@ -26,7 +26,7 @@ common haskell
                      , parsers ^>= 0.12.10
                      , semantic-ast
                      , semantic-core ^>= 0.0
-                     , semantic-source ^>= 0.0.2
+                     , semantic-source ^>= 0.1.0
                      , semantic-tags ^>= 0.0
                      , template-haskell ^>= 2.15
                      , text ^>= 1.2.3

semantic-typescript/semantic-typescript.cabal

@@ -26,7 +26,7 @@ common haskell
                      , parsers ^>= 0.12.10
                      , semantic-ast
                      , semantic-core ^>= 0.0
-                     , semantic-source ^>= 0.0.2
+                     , semantic-source ^>= 0.1.0
                      , semantic-tags ^>= 0.0
                      , template-haskell ^>= 2.15
                      , text ^>= 1.2.3

semantic.cabal

@@ -59,7 +59,7 @@ common dependencies
                      , fused-effects-exceptions ^>= 1
                      , fused-effects-resumable ^>= 0.1
                      , hashable >= 1.2.7 && < 1.4
-                     , tree-sitter ^>= 0.9.0.0
+                     , tree-sitter ^>= 0.9.0.1
                      , mtl ^>= 2.2.2
                      , network ^>= 2.8.0.0
                      , pathtype ^>= 0.8.1
@@ -69,7 +69,7 @@ common dependencies
                      , safe-exceptions ^>= 0.1.7.0
                      , semantic-analysis ^>= 0
                      , semantic-ast
-                     , semantic-source ^>= 0.0.2
+                     , semantic-source ^>= 0.1.0
                      , semilattices ^>= 0.0.0.3
                      , streaming ^>= 0.2.2.0
                      , text ^>= 1.2.3.1

src/Control/Abstract/Heap.hs

@@ -77,7 +77,7 @@ import           Data.Semilattice.Lower
 import           Data.Set (Set)
 import           GHC.Generics (Generic1)
 import           GHC.Stack
-import           Source.Span (Span)
+import           Source.Span (Pos (..), Span, point)
 
 
 -- | Evaluates an action locally the scope and frame of the given frame address.
@@ -191,7 +191,7 @@ define :: ( HasCallStack
        -> Evaluator term address value m ()
 define declaration rel accessControl def = withCurrentCallStack callStack $ do
   -- TODO: This span is still wrong.
-  declare declaration rel accessControl lowerBound Unknown Nothing
+  declare declaration rel accessControl (point (Pos 1 1)) Unknown Nothing
   slot <- lookupSlot declaration
   value <- def
   assign slot value

src/Control/Abstract/Modules.hs

@@ -40,7 +40,6 @@ import           Control.Monad.IO.Class
 import           Data.Foldable
 import           Data.Functor.Classes
 import           Data.Maybe.Exts
-import           Data.Semilattice.Lower
 import           Data.Set (Set)
 import qualified Data.Set as Set
 import           GHC.Generics (Generic1)
@@ -147,7 +146,7 @@ runLoadErrorWith f = raiseHandler $ With.runResumable (runEvaluator . f)
 throwLoadError :: Has (Resumable (BaseError (LoadError address value))) sig m
                => LoadError address value resume
                -> m resume
-throwLoadError err@(ModuleNotFoundError name) = throwResumable $ BaseError (ModuleInfo name "Unknown" mempty) lowerBound err
+throwLoadError err@(ModuleNotFoundError name) = throwResumable $ BaseError (ModuleInfo name "Unknown" mempty) (point (Pos 1 1)) err
 -- TODO: Might be able to get rest of ModuleInfo from the env ^.
 
 

src/Control/Abstract/Primitive.hs

@@ -18,9 +18,9 @@ import           Data.Abstract.BaseError
 import qualified Data.Abstract.ScopeGraph as ScopeGraph
 import           Data.Map.Strict as Map
 import           Data.Maybe
-import           Data.Semilattice.Lower
 import           Data.Traversable
 import           GHC.Stack
+import           Source.Span (Pos (..), point)
 
 defineBuiltIn :: ( HasCallStack
                  , Has (Deref value) sig m
@@ -47,11 +47,11 @@ defineBuiltIn declaration rel accessControl value = withCurrentCallStack callSta
   let lexicalEdges = Map.singleton Lexical [ currentScope' ]
   associatedScope <- newPreludeScope lexicalEdges
   -- TODO: This span is still wrong.
-  declare declaration rel accessControl lowerBound ScopeGraph.Unknown (Just associatedScope)
+  declare declaration rel accessControl (point (Pos 1 1)) ScopeGraph.Unknown (Just associatedScope)
 
   withScope associatedScope $ do
     param <- gensym
-    declare (Declaration param) ScopeGraph.Gensym accessControl lowerBound ScopeGraph.Unknown Nothing
+    declare (Declaration param) ScopeGraph.Gensym accessControl (point (Pos 1 1)) ScopeGraph.Unknown Nothing
 
   slot <- lookupSlot declaration
   value <- builtIn associatedScope value

src/Data/Abstract/Evaluatable.hs

@@ -35,11 +35,10 @@ import           Data.Functor.Classes
 import           Data.List.NonEmpty (nonEmpty)
 import           Data.Scientific (Scientific)
 import           Data.Semigroup.Foldable
-import           Data.Semilattice.Lower
 import           Data.Sum
 import           Data.Text
 import           GHC.Stack
-import           Source.Span (HasSpan (..))
+import           Source.Span (HasSpan (..), Pos (..), point)
 
 import           Analysis.Name as X
 import           Control.Abstract hiding (Load, String)
@@ -229,7 +228,7 @@ defineSelf :: ( Has (State (ScopeGraph address)) sig m
            => Evaluator term address value m ()
 defineSelf = do
   let self = Declaration __self
-  declare self ScopeGraph.Prelude Public lowerBound ScopeGraph.Unknown Nothing
+  declare self ScopeGraph.Prelude Public (point (Pos 1 1)) ScopeGraph.Unknown Nothing
   slot <- lookupSlot self
   assign slot =<< object =<< currentFrame
 

src/Data/Blob/IO.hs

@@ -17,9 +17,9 @@ import           Data.Blob
 import qualified Data.ByteString as B
 import           Data.Language
 import           Data.Maybe.Exts
-import           Data.Semilattice.Lower
 import           Semantic.IO
 import qualified Source.Source as Source
+import           Source.Span
 import qualified System.Path as Path
 
 -- | Deprecated: this has very weird semantics.
@@ -44,7 +44,7 @@ readProjectFromPaths maybeRoot path lang excludeDirs = do
   blobs <- liftIO $ traverse (readBlobFromFile' . toFile) paths
   pure $ Project rootDir blobs lang excludeDirs
   where
-    toFile path = File path lowerBound lang
+    toFile path = File path (point (Pos 1 1)) lang
     exts = extensionsForLanguage lang
 
 

src/Data/Syntax/Declaration.hs

@@ -18,7 +18,6 @@ import           Data.Functor.Classes.Generic
 import           Data.Hashable.Lifted
 import qualified Data.Map.Strict as Map
 import           Data.Maybe.Exts
-import           Data.Semilattice.Lower
 import qualified Data.Set as Set
 import           Data.Traversable
 import           GHC.Generics (Generic1)
@@ -106,7 +105,7 @@ instance Evaluatable Method where
 
     params <- withScope associatedScope $ do
       -- TODO: Should we give `self` a special Relation?
-      declare (Declaration __self) ScopeGraph.Prelude ScopeGraph.Public lowerBound ScopeGraph.Unknown Nothing
+      declare (Declaration __self) ScopeGraph.Prelude ScopeGraph.Public (point (Pos 1 1)) ScopeGraph.Unknown Nothing
       for methodParameters $ \paramNode -> declareMaybeName (declaredName paramNode) Default ScopeGraph.Public (paramNode^.span_) ScopeGraph.Parameter Nothing
 
     addr <- lookupSlot (Declaration name)

src/Language/TypeScript/Syntax/Import.hs

@@ -19,10 +19,10 @@ import           Data.Hashable
 import           Data.Hashable.Lifted
 import           Data.JSON.Fields
 import qualified Data.Map.Strict as Map
-import           Data.Semilattice.Lower
 import           Diffing.Algorithm
 import           GHC.Generics (Generic, Generic1)
 import           Language.TypeScript.Resolution
+import           Source.Span
 
 data Import a = Import { importSymbols :: ![Alias], importFrom :: ImportPath }
   deriving (Declarations1, Diffable, Foldable, FreeVariables1, Functor, Generic1, Hashable1, ToJSONFields1, Traversable)
@@ -50,7 +50,7 @@ instance Evaluatable Import where
         for_ symbols $ \Alias{..} ->
           -- TODO: Need an easier way to get the span of an Alias. It's difficult because we no longer have a term.
           -- Even if we had one we'd have to evaluate it at the moment.
-          insertImportReference (Reference aliasName) lowerBound ScopeGraph.Identifier (Declaration aliasValue) scopeAddress
+          insertImportReference (Reference aliasName) (point (Pos 1 1)) ScopeGraph.Identifier (Declaration aliasValue) scopeAddress
 
       -- Create edges from the current scope/frame to the import scope/frame.
       insertImportEdge scopeAddress
@@ -110,7 +110,7 @@ instance Evaluatable QualifiedExport where
     withScope exportScope .
       for_ exportSymbols $ \Alias{..} -> do
         -- TODO: Replace Alias in QualifedExport with terms and use a real span
-        reference (Reference aliasName) lowerBound ScopeGraph.Identifier (Declaration aliasValue)
+        reference (Reference aliasName) (point (Pos 1 1)) ScopeGraph.Identifier (Declaration aliasValue)
 
     -- Create an export edge from a new scope to the qualifed export's scope.
     unit
@@ -140,7 +140,7 @@ instance Evaluatable QualifiedExportFrom where
     withScopeAndFrame moduleFrame .
       for_ exportSymbols $ \Alias{..} -> do
         -- TODO: Replace Alias with terms in QualifiedExportFrom and use a real span below.
-        insertImportReference (Reference aliasName) lowerBound ScopeGraph.Identifier (Declaration aliasValue) exportScope
+        insertImportReference (Reference aliasName) (point (Pos 1 1)) ScopeGraph.Identifier (Declaration aliasValue) exportScope
 
     insertExportEdge exportScope
     insertFrameLink ScopeGraph.Export (Map.singleton exportScope exportFrame)

src/Semantic/Api/TOCSummaries.hs

@@ -1,4 +1,15 @@
-{-# LANGUAGE AllowAmbiguousTypes, DataKinds, FlexibleContexts, FlexibleInstances, LambdaCase, MultiParamTypeClasses, RecordWildCards, ScopedTypeVariables, TupleSections, TypeApplications, TypeFamilies, UndecidableInstances #-}
+{-# LANGUAGE AllowAmbiguousTypes #-}
+{-# LANGUAGE DataKinds #-}
+{-# LANGUAGE FlexibleContexts #-}
+{-# LANGUAGE FlexibleInstances #-}
+{-# LANGUAGE LambdaCase #-}
+{-# LANGUAGE MultiParamTypeClasses #-}
+{-# LANGUAGE RecordWildCards #-}
+{-# LANGUAGE ScopedTypeVariables #-}
+{-# LANGUAGE TupleSections #-}
+{-# LANGUAGE TypeApplications #-}
+{-# LANGUAGE TypeFamilies #-}
+{-# LANGUAGE UndecidableInstances #-}
 module Semantic.Api.TOCSummaries
 ( diffSummary
 , legacyDiffSummary
@@ -8,7 +19,7 @@ module Semantic.Api.TOCSummaries
 ) where
 
 import           Analysis.Decorator (decoratorWithAlgebra)
-import           Analysis.TOCSummary (Declaration(..), HasDeclaration, Kind(..), declarationAlgebra, formatKind)
+import           Analysis.TOCSummary (Declaration (..), HasDeclaration, Kind (..), declarationAlgebra, formatKind)
 import           Control.Applicative (liftA2)
 import           Control.Effect.Error
 import           Control.Effect.Parse
@@ -22,13 +33,12 @@ import           Data.Edit
 import           Data.Either (partitionEithers)
 import           Data.Function (on)
 import           Data.Functor.Foldable (Base, Recursive)
-import           Data.Language (Language, LanguageMode(..), PerLanguageModes)
+import           Data.Language (Language, LanguageMode (..), PerLanguageModes)
 import           Data.Map (Map)
 import qualified Data.Map.Monoidal as Map
 import           Data.Maybe (mapMaybe)
 import           Data.ProtoLens (defMessage)
-import           Data.Semilattice.Lower
+import           Data.Term (IsTerm (..), TermF)
-import           Data.Term (IsTerm(..), TermF)
 import qualified Data.Text as T
 import qualified Diffing.Algorithm.SES as SES
 import           Diffing.Interpreter (DiffTerms)
@@ -43,6 +53,7 @@ import           Semantic.Task as Task
 import           Serializing.Format
 import           Source.Loc as Loc
 import           Source.Source as Source
+import           Source.Span
 import qualified Tags.Tag as Tag
 import qualified Tags.Tagging.Precise as Tagging
 
@@ -55,7 +66,7 @@ legacyDiffSummary = distributeFoldMap go
     go :: (Has (Error SomeException) sig m, Has Parse sig m, Has (Reader PerLanguageModes) sig m, Has Telemetry sig m, MonadIO m) => BlobPair -> m Summaries
     go blobPair = asks summarizeTermParsers >>= \ p -> parsePairWith p (fmap (uncurry (flip Summaries) . bimap toMap toMap . partitionEithers) . summarizeTerms) blobPair
       `catchError` \(SomeException e) ->
-        pure $ Summaries mempty (toMap [ErrorSummary (T.pack (show e)) lowerBound lang])
+        pure $ Summaries mempty (toMap [ErrorSummary (T.pack (show e)) (point (Pos 1 1)) lang])
       where path = T.pack $ pathKeyForBlobPair blobPair
             lang = languageForBlobPair blobPair
 

src/Semantic/Graph.hs

@@ -86,6 +86,10 @@ import           Source.Span
 import qualified System.Path as Path
 import           Text.Show.Pretty (ppShow)
 
+-- TODO: this should be zero-indexed (https://github.com/github/semantic/issues/263)
+initialSpan :: Span
+initialSpan = point (Pos 1 1)
+
 data GraphType = ImportGraph | CallGraph
 
 isPathPrefixOf :: Path.AbsRelDir -> Path.AbsRelFile -> Bool
@@ -192,8 +196,8 @@ runCallGraph lang includePackages modules package
   . resumingResolutionError
   . resumingAddressError
   . raiseHandler (runReader (packageInfo package))
-  . raiseHandler (runReader (lowerBound @Span))
+  . raiseHandler (runReader initialSpan)
-  . raiseHandler (runState (lowerBound @Span))
+  . raiseHandler (runState initialSpan)
   . raiseHandler (runReader (lowerBound @ControlFlowVertex))
   . providingLiveSet
   . runModuleTable
@@ -255,8 +259,8 @@ runImportGraph lang package f
   . runModuleTable
   . runModules (ModuleTable.modulePaths (packageModules package))
   . raiseHandler (runReader (packageInfo package))
-  . raiseHandler (runState (lowerBound @Span))
+  . raiseHandler (runState initialSpan)
-  . raiseHandler (runReader (lowerBound @Span))
+  . raiseHandler (runReader initialSpan)
   . raiseHandler (runState (lowerBound @(ScopeGraph (Hole (Maybe Name) Precise))))
   . runAllocator
   $ evaluate lang (graphingModuleInfo (runDomainEffects (evalTerm id))) (snd <$> ModuleTable.toPairs (packageModules package))
@@ -318,8 +322,8 @@ parsePythonPackage parser project = do
         . runModuleTable
         . runModules lowerBound
         . raiseHandler (runReader (PackageInfo (Data.Abstract.Evaluatable.name "setup") lowerBound))
-        . raiseHandler (runState (lowerBound @Span))
+        . raiseHandler (runState initialSpan)
-        . raiseHandler (runReader (lowerBound @Span))
+        . raiseHandler (runReader initialSpan)
         . raiseHandler (runState (lowerBound @(ScopeGraph (Hole (Maybe Name) Precise))))
         . runAllocator
 

src/Semantic/Util.hs

@@ -41,14 +41,13 @@ import           Data.Graph.Algebraic (topologicalSort)
 import qualified Data.Language as Language
 import           Data.List (uncons)
 import           Data.Maybe
-import           Data.Semilattice.Lower
 import           Data.Sum
 import           Parsing.Parser
 import           Semantic.Analysis
 import           Semantic.Config
 import           Semantic.Graph
 import           Semantic.Task
-import           Source.Span (HasSpan (..))
+import           Source.Span (HasSpan (..), Pos (..), point)
 import           System.Exit (die)
 import           System.FilePath.Posix (takeDirectory)
 import qualified System.Path as Path
@@ -85,11 +84,12 @@ evaluateProject' session proxy parser paths = do
     trace $ "evaluating with load order: " <> show (map (modulePath . moduleInfo) modules)
     pure (package, modules)
   (package, modules) <- either (die . displayException) pure res
+  let initialSpan = point (Pos 1 1)
   pure (runModuleTable
        (runModules (ModuleTable.modulePaths (packageModules package))
        (raiseHandler (runReader (packageInfo package))
-       (raiseHandler (evalState (lowerBound @Span))
+       (raiseHandler (evalState initialSpan)
-       (raiseHandler (runReader (lowerBound @Span))
+       (raiseHandler (runReader initialSpan)
        (evaluate proxy (runDomainEffects (evalTerm (withTermSpans (^. span_)))) modules))))))
 
 parseFile, parseFileQuiet :: Parser term -> FilePath -> IO term
@@ -97,7 +97,7 @@ parseFile      parser = runTask'     . (parse parser <=< readBlob . fileForPath)
 parseFileQuiet parser = runTaskQuiet . (parse parser <=< readBlob . fileForPath)
 
 fileForPath :: FilePath -> File Language.Language
-fileForPath (Path.absRel -> p) = File p lowerBound (Language.forPath p)
+fileForPath (Path.absRel -> p) = File p (point (Pos 1 1)) (Language.forPath p)
 
 runTask', runTaskQuiet :: ParseC TaskC a -> IO a
 runTask'     task = runTaskWithOptions debugOptions   (asks configTreeSitterParseTimeout >>= \ timeout -> runParse timeout task) >>= either (die . displayException) pure

test/SpecHelpers.hs

@@ -76,6 +76,7 @@ import           Semantic.Util as X
 import           Source.Range as X hiding (end, point, start)
 import           Source.Source as X (Source)
 import           Source.Span as X hiding (HasSpan (..), end, point, start)
+import qualified Source.Span
 import           System.Exit (die)
 import qualified System.Path as Path
 import           Test.Hspec as X (Spec, SpecWith, around, context, describe, it, parallel, pendingWith, runIO, xit)
@@ -84,6 +85,9 @@ import           Test.Hspec.LeanCheck as X
 import           Test.LeanCheck as X
 import           Unsafe.Coerce (unsafeCoerce)
 
+instance Lower X.Span where
+  lowerBound = Source.Span.point (Pos 1 1)
+
 runBuilder :: Builder -> ByteString
 runBuilder = toStrict . toLazyByteString