Commit f77f5f5

authored

Rework word completion: Split out PrefixNode class (#1529)

1 parent 6056e9a commit f77f5f5Copy full SHA for f77f5f5

File tree

+38

-15

lines changed

plugins/word-completion
- meson.build
- prefix-tree-node.vala
- prefix-tree.vala

+38

-15

lines changed

Lines changed: 1 addition & 0 deletions

Lines changed: 35 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,35 @@`
	`1`	`+/*`
	`2`	`+ * Copyright 2024 elementary, Inc.`
	`3`	`+ * 2011 Lucas Baudin`
	`4`	`+ * *`
	`5`	`+ * This is a free software; you can redistribute it and/or`
	`6`	`+ * modify it under the terms of the GNU General Public License as`
	`7`	`+ * published by the Free Software Foundation; either version 2 of the`
	`8`	`+ * License, or (at your option) any later version.`
	`9`	`+ *`
	`10`	`+ * This is distributed in the hope that it will be useful,`
	`11`	`+ * but WITHOUT ANY WARRANTY; without even the implied warranty of`
	`12`	`+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU`
	`13`	`+ * General Public License for more details.`
	`14`	`+ *`
	`15`	`+ * You should have received a copy of the GNU General Public`
	`16`	`+ * License along with this program; see the file COPYING. If not,`
	`17`	`+ * write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,`
	`18`	`+ * Boston, MA 02110-1301 USA.`
	`19`	`+ *`
	`20`	`+ */`
	`21`	`+`
	`22`	`+public class Scratch.Plugins.PrefixNode : Object {`
	`23`	`+ public GLib.List<PrefixNode> children;`
	`24`	`+ public unichar value { get; construct; }`
	`25`	`+`
	`26`	`+ public PrefixNode (unichar c = '\0') {`
	`27`	`+ Object (`
	`28`	`+ value: c`
	`29`	`+ );`
	`30`	`+ }`
	`31`	`+`
	`32`	`+ construct {`
	`33`	`+ children = new List<PrefixNode> ();`
	`34`	`+ }`
	`35`	`+}`

Lines changed: 2 additions & 15 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,14 +1,5 @@`
`1`	`1`
`2`	`2`	`namespace Scratch.Plugins {`
`3`		`- private class PrefixNode : Object {`
`4`		`- public GLib.List<PrefixNode> children;`
`5`		`- public unichar value { get; set; }`
`6`		`-`
`7`		`- construct {`
`8`		`- children = new List<PrefixNode> ();`
`9`		`- }`
`10`		`- }`
`11`		`-`
`12`	`3`	`public class PrefixTree : Object {`
`13`	`4`	`private PrefixNode root;`
`14`	`5`
`@@ -17,9 +8,7 @@ namespace Scratch.Plugins {`
`17`	`8`	`}`
`18`	`9`
`19`	`10`	`public void clear () {`
`20`		`- root = new PrefixNode () {`
`21`		`- value = '\0'`
`22`		`- };`
	`11`	`+ root = new PrefixNode ();`
`23`	`12`	`}`
`24`	`13`
`25`	`14`	`public void insert (string word) {`
`@@ -47,9 +36,7 @@ namespace Scratch.Plugins {`
`47`	`36`	`}`
`48`	`37`	`}`
`49`	`38`
`50`		`- var new_child = new PrefixNode () {`
`51`		`- value = curr`
`52`		`- };`
	`39`	`+ var new_child = new PrefixNode (curr);`
`53`	`40`	`node.children.insert_sorted (new_child, (c1, c2) => {`
`54`	`41`	`if (c1.value > c2.value) {`
`55`	`42`	`return 1;`

Comments

(0)