Merge branch 'main' into vs-code-diagnostics

candy-lang · Dec 21, 2024 · 7d828aa · 7d828aa
2 parents dd7b7cc + 52cbce4
commit 7d828aa
Show file tree

Hide file tree

Showing 5 changed files with 36 additions and 42 deletions.
diff --git a/packages_v5/example.candy b/packages_v5/example.candy
@@ -263,12 +263,6 @@ fun get(self: Text, index: Int) Maybe[Text] {
 fun getRange(self: Text, startInclusive: Int, endExclusive: Int) Text {
   self.builtinTextGetRange(startInclusive, endExclusive)
 }
-fun characterAt(self: Text, index: Int) Maybe[Text] {
-  switch index.isInRange(0, self.length()) {
-    false => none[Text](),
-    true => some(self.getRange(index, index.add(1))),
-  }
-}
 fun characters(self: Text) List[Text] {
   listGenerate(self.length(), (i: Int) { self.get(i).unwrap() })
 }
@@ -305,7 +299,7 @@ fun splitIf(self: Text, predicate: (Text) Bool) List[Text] {
   self.splitIfHelper(predicate, 0, 0 listOf[Text]())
 }
 fun splitIfHelper(self: Text, predicate: (Text) Bool, currentStartOffset: Int, offset: Int, result: List[Text]) List[Text] {
-  switch self.characterAt(offset) {
+  switch self.get(offset) {
     none => result.append(self.getRange(currentStartOffset, offset)),
     some(char) => switch predicate(char) {
       true => {
@@ -589,12 +583,12 @@ fun all[T](list: List[T], predicate: (T) Bool) Bool {
   list.allHelper(predicate, 0)
 }
 fun allHelper[T](list: List[T], predicate: (T) Bool, index: Int) Bool {
-  switch index.isLessThan(list.length()) {
-    true => switch predicate(list.get(index).unwrap()) {
+  switch list.get(index) {
+    some(item) => switch predicate(item) {
       true => list.allHelper(predicate, index.add(1)),
       false => false,
     },
-    false => true,
+    none => true,
   }
 }
 fun any[T](list: List[T], predicate: (T) Bool) Bool {

diff --git a/vscode_extension/package-lock.json b/vscode_extension/package-lock.json
diff --git a/vscode_extension/package.json b/vscode_extension/package.json
@@ -243,7 +243,7 @@
     "test": "node ./out/test/runTest.js"
   },
   "dependencies": {
-    "@vscode/debugadapter": "^1.65.0",
+    "@vscode/debugadapter": "^1.68.0",
     "vscode-languageclient": "^9.0.1"
   },
   "devDependencies": {
@@ -258,7 +258,7 @@
     "eslint-plugin-prettier": "^5.2.1",
     "glob": "^10.3.10",
     "mocha": "^10.8.2",
-    "prettier": "^3.4.1",
+    "prettier": "^3.4.2",
     "typescript": "^5.4.5",
     "vscode-test": "^1.4.0"
   },

diff --git a/vscode_extension_v4/package-lock.json b/vscode_extension_v4/package-lock.json
diff --git a/vscode_extension_v4/package.json b/vscode_extension_v4/package.json
@@ -79,7 +79,7 @@
     "eslint": "^8.57.0",
     "eslint-config-prettier": "^9.1.0",
     "eslint-plugin-prettier": "^5.2.1",
-    "prettier": "^3.4.1",
+    "prettier": "^3.4.2",
     "typescript": "^5.3.3"
   },
   "eslintConfig": {