dsource.org

Open Source Development for
the D Programming Language

Navigation

← Previous Changeset
Next Changeset →

Changeset 186

Timestamp:

12/14/06 22:28:45 (2 years ago)

Author:

Alan Knowles

Message:

Simplify interfaces - getLanguageHander always returns a Language Object - no need to test, constructor uses codeview, so that does not need to be passed around

Files:

trunk/src/leds/BrowserView.d (modified) (1 diff)
trunk/src/leds/CodeView.d (modified) (16 diffs)
trunk/src/leds/Language.d (modified) (14 diffs)
trunk/src/leds/LanguageD.d (modified) (29 diffs)
trunk/src/leds/LanguageJava.d (modified) (3 diffs)
trunk/src/leds/LanguageMakefile.d (modified) (2 diffs)
trunk/src/leds/LanguagePHP.d (modified) (15 diffs)

Legend:

: Unmodified
: Added
: Removed
: Modified
: Copied
: Moved

trunk/src/leds/BrowserView.d

r177	r186
321	321	toExpand.length = 0;
322	322
323		fileView.getLanguageHandler().loadBrowserData(~~fileView,~~this);
	323	fileView.getLanguageHandler().loadBrowserData(this);
324	324	treeView.setModel(browserTreeStore);
325	325	treeView.expandToPath(new TreePath("1"));

trunk/src/leds/CodeView.d

r185	r186
821	821	}
822	822	if (this.getLanguageHandler()) {
823		this.getLanguageHandler().checkSyntax(~~this~~);
	823	this.getLanguageHandler().checkSyntax();
824	824	setBrowserView(text);
825	825	//missingReturn();
…	…
841	841	{
842	842	// writefln("getLanguage Handler %s", fileName);
843		if (this.languageHandler) {
	843	if (!this.languageHandler) {
844	844	//writefln("returned existing");
845		return this.languageHandler;
846		}
847
848		if ( fileName.length>=8 && fileName[0..7].equalsIgnoreCase("makefile") )
849		{
850		//writefln("languageHandler == Makefile");
851		this.languageHandler = new LanguageMakefile(workspace);
852		return this.languageHandler;
	845	this.languageHandler = Language.factory(this);
853	846
854	847	}
855
856		switch ( Path.getExt(fileName).toUpper().toString() ) {
857
858		case "HTML", "HTM", "PHP", "XUL", "JS", "CSS":
859		//writefln("languageHandler == PHP");
860		this.languageHandler = new LanguagePHP(workspace);
861		return this.languageHandler;
862
863
864		case "D", "C", "CPP", "H": // fixme.. - sort out handlers for all of these.
865		this.languageHandler = new LanguageD(workspace);
866		//writefln("languageHandler == D");
867		return this.languageHandler;
868
869		default:
870		return null;
871
872		}
873
	848	return this.languageHandler;
874	849
875	850	}
…	…
877	852	void missingReturn()
878	853	{
879		// FIXME - move this to LanguageD
880		auto lang = getLanguageHandler();
881		if (!lang \|\| !cast(LanguageD)lang )
882		{
883		return;
884		}
885		String missing = lang.getMissingReturn(this);
	854	String missing = getLanguageHandler().getMissingReturn();
886	855	if (missing) {
887	856	System.writefln("Missing return on: ", missing);
888	857	}
889
890
891
	858
892	859	}
893	860
…	…
1132	1099	++functionLine;
1133	1100
1134		if (this.getLanguageHandler()) {
1135		this.getLanguageHandler().addAutoDocComments(this,functionLine, commStr );
1136
1137
1138		}
	1101	getLanguageHandler().addAutoDocComments(functionLine, commStr );
	1102
1139	1103
1140	1104
…	…
1230	1194
1231	1195	case "lexer.D":
1232		this.languageHandler = new LanguageD(~~workspace~~);
	1196	this.languageHandler = new LanguageD(this);
1233	1197	this.languageHandler.setLex(this.codeEdit);
1234	1198	break;
1235	1199
1236	1200	case "lexer.makefile":
1237		this.languageHandler = new LanguageMakefile(~~workspace~~);
	1201	this.languageHandler = new LanguageMakefile(this);
1238	1202	this.languageHandler.setLex(this.codeEdit);
1239	1203	break;
1240	1204
1241	1205	case "lexer.html":
1242		this.languageHandler = new LanguagePHP(~~workspace~~);
	1206	this.languageHandler = new LanguagePHP(this);
1243	1207	this.languageHandler.setLex(this.codeEdit);
1244	1208	break;
…	…
1398	1362	}
1399	1363	Language lang = this.getLanguageHandler();
1400		if (!lang) {
1401		return false;
1402		}
1403		String[] fileandNum = lang.getElementLocation(this, elementName, lineNumber);
	1364
	1365	String[] fileandNum = lang.getElementLocation(elementName, lineNumber);
1404	1366	if (!fileandNum.length) {
1405	1367	return false;
…	…
1596	1558	return false;
1597	1559	}
1598		if (!this.getLanguageHandler()) {
1599		return false;
1600		}
	1560
1601	1561	auto str = getLeftRightId();
1602	1562	if (!str.length) {
…	…
1604	1564	}
1605	1565	// let's show help..
1606		this.getLanguageHandler().showHelp(~~this,~~str);
	1566	this.getLanguageHandler().showHelp(str);
1607	1567
1608	1568
…	…
1621	1581	return false;
1622	1582	}
1623		Language lang = this.getLanguageHandler();
1624		if (!lang) {
1625		return false;
1626		}
1627		String[] fileandNum = lang.getElementLocation(this, codeEdit.getSelected(), codeEdit.getCurrLine());
	1583
	1584	String[] fileandNum = getLanguageHandler().getElementLocation(codeEdit.getSelected(), codeEdit.getCurrLine());
1628	1585	if (!fileandNum.length) {
1629	1586	return false;
…	…
1767	1724	void extractInterface(MenuItem item)
1768	1725	{
1769
1770		if (!getLanguageHandler()) {
1771		return;
1772		}
1773		String iText = getLanguageHandler().extractInterface(this);
	1726
	1727	String iText = getLanguageHandler().extractInterface();
1774	1728	if (!iText.length) {
1775	1729	return;
…	…
1918	1872	if ( ( language == Language.LangType.JAVA ) && getLanguageHandler()) {
1919	1873
1920		modulePath ~= getLanguageHandler().getModulePath(~~this~~);
	1874	modulePath ~= getLanguageHandler().getModulePath();
1921	1875
1922	1876	}
…	…
2053	2007	if (stringPrint.length() > 0 )
2054	2008	{
2055		String containerFunc = new String();
2056		if (getLanguageHandler()) {
2057		containerFunc = getLanguageHandler().getContainerFunc(this,codeEdit.getCurrLine());
2058		}
	2009
	2010	String containerFunc = getLanguageHandler().getContainerFunc(codeEdit.getCurrLine());
2059	2011
2060
2061
2062
2063	2012	codeEdit.setCurrentPos(pos-1);
2064	2013	int offsetPos = 0;
…	…
2266	2215	return;
2267	2216	}
2268		if (!this.getLanguageHandler()) {
2269		return;
2270		}
	2217
2271	2218	String start = new String();
2272		String[] list = this.getLanguageHandler().getLookupList(~~this,~~start);
	2219	String[] list = this.getLanguageHandler().getLookupList(start);
2273	2220	if ((list.length > 0) && start.length) { // is testing for empty start a good idea?
2274	2221	//writefln("Show auto completion?");
…	…
2585	2532	{
2586	2533	//writefln("Auto Select done : %s", s.toString());
2587		if (!this.getLanguageHandler()) {
2588		return false;
2589		}
2590		this.getLanguageHandler().showHelp(this,s);
	2534
	2535	this.getLanguageHandler().showHelp(s);
2591	2536	return false;
2592	2537	}
…	…
2722	2667	&& Leds.leds.getPropValue("autoComplete",true) )
2723	2668	{
2724		if ( this.getLanguageHandler() ~~&& this.getLanguageHandler().canAutoComplete(this~~)) {
	2669	if ( this.getLanguageHandler().canAutoComplete()) {
2725	2670	fireAutoCompletion();
2726	2671	}
…	…
2922	2867	return;
2923	2868	}
2924		if (!this.getLanguageHandler()) {
2925		return;
2926		}
2927		this.getLanguageHandler().addFolds(this);
	2869
	2870	this.getLanguageHandler().addFolds();
2928	2871	this.collapseAll();
2929	2872	this.hasFolds = true;

trunk/src/leds/Language.d

r180	r186
19	19	D,
20	20	JAVA,
21		PHP
	21	PHP,
	22	MAKEFILE,
22	23	}
23	24	// imports have to go here to stop forward referencing.
…	…
39	40
40	41
41		Workspace workspace;
	42
	43	static Language factory(CodeView codeview)
	44	{
	45	LangType lt = getLanguageFromFileName(codeview.getFileName());
	46	switch (lt) {
	47	case Language.LangType.D:
	48	return new LanguageD(codeview);
	49	case Language.LangType.PHP:
	50	return new LanguagePHP(codeview);
	51	case Language.LangType.JAVA:
	52	return new LanguageJava(codeview);
	53	case Language.LangType.MAKEFILE:
	54	return new LanguageMakefile(codeview);
	55	default:
	56	return new Language(codeview);
	57
	58	}
	59	}
42	60
43	61	this()
…	…
46	64	}
47	65
48		this(Workspace ws)
49		{
50		this.workspace = ws;
51		}
	66	CodeView codeview;
	67
	68	this(CodeView codeview)
	69	{
	70	this.codeview = codeview;
	71	}
	72
52	73
53	74	/**
…	…
72	93	}
73	94
74		void loadBrowserData(~~FileView fileView,~~ BrowserView bv)
	95	void loadBrowserData(BrowserView bv)
75	96	{
76	97
…	…
82	103	* @param codeview
83	104	*/
84		abstract void addFolds(CodeView codeview);
85
86		bool canAutoComplete(CodeView codeview)
	105	void addFolds()
	106	{
	107
	108	}
	109
	110	bool canAutoComplete()
87	111	{
88	112	return false;
…	…
95	119	*/
96	120
97		abstract String[] getLookupList(CodeView codeview, inout String start);
	121	String[] getLookupList(inout String start)
	122	{
	123	String[] str;
	124	return str;
	125	}
98	126	/**
99	127	* On saving the file, this is called to see if there are any syntax errors
…	…
103	131	* @return
104	132	*/
105		abstract bit checkSyntax(CodeView codeview);
	133	bit checkSyntax()
	134	{
	135	return true;
	136	}
106	137	/**
107	138	* setup all the options for scintilla to render language correctly.
108	139	* @param scintilla
109	140	*/
110		abstract void setLex(Scintilla scintilla);
	141	void setLex(Scintilla scintilla)
	142	{
	143
	144	}
111	145	/**
112	146	* show help in help bar giving autocompletion or just a string.
113	147	* @param s string to show help about.
114	148	*/
115		abstract void showHelp(CodeView codeview, String s);
	149	void showHelp(String s)
	150	{
	151
	152	}
116	153
117	154
…	…
127	164	}
128	165
129		String[] getElementLocation(~~CodeView codeview,~~ String s, int lineNumber)
	166	String[] getElementLocation(String s, int lineNumber)
130	167	{
131	168	String[] ret;
…	…
135	172	* Check for return missing.
136	173	*/
137		String getMissingReturn(~~CodeView codeview~~)
	174	String getMissingReturn()
138	175	{
139	176	return null;
…	…
143	180	{
144	181	LangType language = LangType.NONE;
	182	if ( fileName.length>=8 && fileName[0..7].equalsIgnoreCase("makefile") )
	183	{
	184	language = Language.LangType.MAKEFILE;
	185	}
	186
145	187	if ( fileName !is null && fileName.length>0 )
146	188	{
147	189	switch(Path.getExt(fileName).toString())
148	190	{
149		case "d":
	191	case "d", "c", "cpp", "h":
150	192	language = LangType.D;
151	193	break;
…	…
155	197	break;
156	198
157		case "html":
158		case "php":
	199	case "html", "htm", "php", "xul", "js", "css":
159	200	language = LangType.PHP;
160	201	break;
…	…
163	204	language = LangType.NONE;
164	205	break;
	206
	207
165	208	}
166	209	}
…	…
210	253	*/
211	254
212		void addAutoDocComments(~~CodeView codeview,~~ int functionLine,char[] commStr)
	255	void addAutoDocComments(int functionLine,char[] commStr)
213	256	{
214	257	}
…	…
216	259	* get Module page - used to get Java path.
217	260	*/
218		String getModulePath(~~CodeView codeview~~)
219		{
220		return new String();
221		}
222		String getContainerFunc(~~CodeView codeview,~~ int line)
	261	String getModulePath()
	262	{
	263	return new String();
	264	}
	265	String getContainerFunc(int line)
223	266	{
224	267	return new String();
225	268	}
226		String ~~extractInterface(CodeView codeview~~)
	269	String extractInterface()
227	270	{
228	271	return new String();

trunk/src/leds/LanguageD.d

r180	r186
43	43	private import std.stdio;
44	44
45		this(~~Workspace ws~~)
46		{
47		super(ws);
	45	this(CodeView codeview)
	46	{
	47	super(codeview);
48	48	}
49	49
…	…
97	97
98	98
99		void loadBrowserData(FileView fileView, BrowserView bv)
100		{
101		if (!(cast(CodeView)fileView)) {
102		//writefln("loadBrowserData - not Codeview?");
103		return;
104		}
105		Element sourceModule = getCachedModule(cast(CodeView)fileView);
	99	void loadBrowserData(BrowserView bv)
	100	{
	101
	102	Element sourceModule = getCachedModule();
106	103
107	104	if (!sourceModule ) {
…	…
312	309
313	310
314		void addFolds(~~CodeView codeview~~)
	311	void addFolds()
315	312	{
316	313
317		Element sourceModule = getCachedModule(~~codeview~~);
318
319		this.addFoldsElement(~~codeview,~~ sourceModule, 0);
	314	Element sourceModule = getCachedModule();
	315
	316	this.addFoldsElement(sourceModule, 0);
320	317
321	318	}
322	319
323		void addFoldsElement(~~CodeView codeview,~~ Element element, int foldOffset)
	320	void addFoldsElement(Element element, int foldOffset)
324	321	{
325	322	/*
…	…
366	363
367	364	foreach(Element elementChild ; element.elements.sort) {
368		addFoldsElement(~~codeview,~~ elementChild,newFoldOffset + 1);
	365	addFoldsElement(elementChild,newFoldOffset + 1);
369	366	}
370	367
…	…
380	377	* This still needs more work, as typing a space causes a reparse..
381	378	*/
382		bool canAutoComplete(~~CodeView codeview~~)
	379	bool canAutoComplete()
383	380	{
384	381
…	…
399	396	}
400	397
401		String[] getLookupList(~~CodeView codeView,~~ inout String start)
	398	String[] getLookupList(inout String start)
402	399	{
403	400	//return (new CodeLookup(codeview)).getLookupList(codeview, start);
…	…
407	404
408	405	// recalculate the code browser
409		Module sourceModule = getCachedModule(~~codeView~~);
	406	Module sourceModule = getCachedModule();
410	407
411	408	// gets the inner most container for this line
412		Element container = sourceModule.getContainerForLine(codeView.getLineNumber());
	409	Element container = sourceModule.getContainerForLine(codeview.getLineNumber());
413	410	if ( container is null )
414	411	{
…	…
417	414
418	415	// determines the tokens to the left of the caret
419		start = codeView.getLeftId();
	416	start = codeview.getLeftId();
420	417
421	418	debug(lookup) printf("CodeLookup.getLookupList start = %.*s\n", start.toString());
422	419
423		Project project = codeView.getProject();
	420	Project project = codeview.getProject();
424	421	// let's start by doing a static lookup.
425	422	if (!project) {
…	…
561	558	* @return true if the sintax is correct
562	559	*/
563		bit checkSyntax(~~CodeView codeview~~)
	560	bit checkSyntax()
564	561	{
565	562	//debug(flow ) System.writefln("CodeView.checkSintax 1");
…	…
653	650	//debug(flow ) System.writefln("CodeView.checkSintax 8");
654	651	codeview.getWorkspace().getSystemConsole.print("Compile Result:\n" ~ spawn.getOutputString() ~ "\n");
655		checkSyntax(~~codeview,~~ spawn.getOutputString(), spawn.getErrorString());
	652	checkSyntax( spawn.getOutputString(), spawn.getErrorString());
656	653	//workspace.getStatusbar().addBackgroundProcess();
657	654	//debug(flow ) System.writefln("CodeView.checkSintax 9");
…	…
661	658	}
662	659
663		bit checkSyntax(~~CodeView codeview,~~ char[] grabOutput, char[] grabError)
	660	bit checkSyntax(char[] grabOutput, char[] grabError)
664	661	{
665	662	foreach ( String line ; (new String(grabOutput)).splitLines() )
…	…
838	835	*/
839	836
840		void showHelp(~~CodeView codeview,~~ String s)
	837	void showHelp(String s)
841	838	{
842	839	String[] strs = s.split("(");
…	…
844	841
845	842	char elementType = ' ';
846		Element e = getElementByName(~~codeview,~~ s, codeview.getLineNumber(), elementType);
	843	Element e = getElementByName(s, codeview.getLineNumber(), elementType);
847	844
848	845
…	…
905	902	static d_time cachedModuleReadTime;
906	903
907		Module getCachedModule(~~CodeView codeview~~)
	904	Module getCachedModule()
908	905	{
909	906	//writefln("trying to get cached view");
…	…
945	942
946	943
947		Element getElementByName(~~CodeView codeview,~~ String s, int lineNumber, inout char elementType)
	944	Element getElementByName(String s, int lineNumber, inout char elementType)
948	945	{
949	946
…	…
958	955	return null;
959	956	}
960		Module sourceModule = this.getCachedModule(~~codeview~~);
	957	Module sourceModule = this.getCachedModule();
961	958
962	959	// gets the inner most container for this line
…	…
1104	1101	*/
1105	1102
1106		String[] getElementLocation(~~CodeView codeview,~~ String s, int lineNumber)
	1103	String[] getElementLocation(String s, int lineNumber)
1107	1104	{
1108	1105
…	…
1114	1111	String[] ret;
1115	1112	char elementType = ' ';
1116		Element e = getElementByName(~~codeview,~~ s, lineNumber, elementType);
	1113	Element e = getElementByName(s, lineNumber, elementType);
1117	1114
1118	1115	switch (elementType) {
…	…
1156	1153	*/
1157	1154
1158		String getMissingReturn(~~CodeView codeview~~)
1159		{
1160
1161		auto thisModule = this.getCachedModule(~~codeview~~);
	1155	String getMissingReturn()
	1156	{
	1157
	1158	auto thisModule = this.getCachedModule();
1162	1159
1163	1160	if ( !thisModule )
…	…
1165	1162	return new String();
1166	1163	}
1167		return getMissingReturn(~~codeview,~~ thisModule);
1168
1169
1170
1171		}
1172
1173		String getMissingReturn(~~CodeView codeview,~~Element element)
	1164	return getMissingReturn(thisModule);
	1165
	1166
	1167
	1168	}
	1169
	1170	String getMissingReturn(Element element)
1174	1171	{
1175	1172	String miss = new String();
…	…
1190	1187	foreach ( Element child ; element.getElements() )
1191	1188	{
1192		miss ~= getMissingReturn(c~~odeview,c~~hild);
	1189	miss ~= getMissingReturn(child);
1193	1190	}
1194	1191	}
…	…
1207	1204
1208	1205	bit findContainer(
1209		~~CodeView codeview,~~
1210	1206	out Block container,
1211	1207	out Function funct,
…	…
1220	1216	//debug(autoComments) System.writefln("CodeView.findContainer 1");
1221	1217	bit found = false;
1222		Module mod = this.getCachedModule(~~codeview~~);
	1218	Module mod = this.getCachedModule();
1223	1219	container = cast(Block)mod.getContainerForLine(lineNumber);
1224	1220	//debug(autoComments) System.writefln("CodeView.findContainer 3");
…	…
1251	1247	*/
1252	1248
1253		void addAutoDocComments(~~CodeView codeview,~~ int functionLine,char[] commStr)
	1249	void addAutoDocComments(int functionLine,char[] commStr)
1254	1250	{
1255	1251
…	…
1264	1260	debug(autoComments) System.writefln("CodeView.doAutoDocComments NOT emptyDocComments 1");
1265	1261
1266		if ( findContainer(co~~deview, co~~ntainer, funct, functionLine) )
	1262	if ( findContainer(container, funct, functionLine) )
1267	1263	{
1268	1264	debug(autoComments) System.writefln("CodeView.doAutoDocComments NOT emptyDocComments 2");
…	…
1342	1338	* get module path support - technically only needed for Java..
1343	1339	*/
1344		String getModulePath(~~CodeView codeview~~)
	1340	String getModulePath()
1345	1341	{
1346	1342
…	…
1361	1357
1362	1358
1363		String getContainerFunc(~~CodeView codeview,~~ int line)
	1359	String getContainerFunc(int line)
1364	1360	{
1365	1361	String ret=new String();
…	…
1368	1364	Block container;
1369	1365	Function funct;
1370		if ( !findContainer(co~~deview, co~~ntainer, funct, line ) )
	1366	if ( !findContainer(container, funct, line ) )
1371	1367	{
1372	1368	return ret;
…	…
1376	1372	}
1377	1373
1378		String extractInterface(~~CodeView codeview~~)
1379		{
1380
1381
1382		Module sourceModule = this.getCachedModule(~~codeview~~);
	1374	String extractInterface()
	1375	{
	1376
	1377
	1378	Module sourceModule = this.getCachedModule();
1383	1379
1384	1380	String iText = new String();

trunk/src/leds/LanguageJava.d

r153	r186
12	12	private import dool.String;
13	13
14		this(~~Workspace ws~~)
	14	this(CodeView codeview)
15	15	{
16		super(ws);
17		}
	16	super(codeview);
	17	}
18	18
19	19	static void setProps(Properties props)
…	…
63	63
64	64	}
65		~~void addFolds(CodeView codeview)~~
66		{
67
68		}
69	65
70		String[] getLookupList(CodeView codeview, inout String start)
71		{
72		String[] ret;
73		return ret;
74		}
	66
75	67
76		bit checkSyntax(CodeView codeview)
77		{
78		return true;
79		}
	68
80	69
81	70	void setLex(Scintilla scintilla)
…	…
109	98	scintilla.setUseTabs(Leds.leds.getPropValue("useTabs.java", true));
110	99	}
111		void showHelp(CodeView codeview, String s)
112		{
113		writefln("LanguageMakefile: show Help %s", s.toString());
114		}
	100
115	101	}

trunk/src/leds/LanguageMakefile.d

r153	r186
17	17	private import dool.String;
18	18
19		this(~~Workspace ws~~)
	19	this(CodeView codeview)
20	20	{
21		super(ws);
22		}
	21	super(codeview);
	22	}
23	23
24	24	static void setProps(Properties props)
…	…
26	26	// do nothing - there are no opts for Makefile yet..
27	27	}
28		void addFolds(CodeView codeview)
29		{
30
31		}
32
33		String[] getLookupList(CodeView codeview, inout String start)
34		{
35		String[] ret;
36		return ret;
37		}
38
39		bit checkSyntax(CodeView codeview)
40		{
41		return true;
42		}
43
	28
	29
	30
44	31	void setLex(Scintilla scintilla)
45	32	{
46	33	scintilla.send(SCI_SETLEXER, SCLEX_MAKEFILE, 0);
47	34	}
48		void showHelp(CodeView codeview, String s)
49		{
50		writefln("LanguageMakefile: show Help %s", s.toString());
51		}
	35
52	36	}

trunk/src/leds/LanguagePHP.d

r176	r186
49	49	static d_time cachedModuleReadTime;
50	50
51		Element getCachedElementBase(~~CodeView codeview,~~ char[][] imports)
	51	Element getCachedElementBase(char[][] imports)
52	52	{
53	53	bool usecache = true;
…	…
92	92	}
93	93
	94	this(CodeView codeview)
	95	{
	96	super(codeview);
	97	}
	98
94	99
95
96		~~this(Workspace ws)~~
97		{
98		~~super(ws);~~
99		}
100
101	100	static void setProps(Properties props)
102	101	{
…	…
162	161	}
163	162
164		void loadBrowserData(FileView fileView, BrowserView bv)
165		{
166		if (!(cast(CodeView)fileView)) {
167		return;
168		}
169		Element sourceModule = getCachedElementBase( cast(CodeView)fileView, getImports(cast(CodeView)fileView));
	163	void loadBrowserData(BrowserView bv)
	164	{
	165
	166	Element sourceModule = getCachedElementBase( getImports());
170	167	if (!sourceModule ) {
171	168	return;
…	…
206	203
207	204
208		char[][] getImports(~~CodeView codeview~~)
	205	char[][] getImports()
209	206	{
210	207	char[][] imports;
…	…
219	216
220	217
221		void addFolds(~~CodeView codeview~~)
	218	void addFolds()
222	219	{
223	220	BrowserView bv = codeview.getWorkspace().getBrowserView();
224
225
226		// load Imports
227
228
229		phpElementBase = getCachedElementBase( codeview , getImports(codeview) );
230
231
232
	221	phpElementBase = getCachedElementBase(getImports() );
233	222	// fixme!
234	223	if (phpElementBase is null) {
…	…
236	225	}
237	226	//phpElementBase.dumpAll();
238		this.addFoldsElementPhp(~~codeview,~~ phpElementBase, 0);
	227	this.addFoldsElementPhp(phpElementBase, 0);
239	228
240	229	}
…	…
243	232	* recursively iterate through elements, and add folds.
244	233	*/
245		void addFoldsElementPhp(~~CodeView codeview,~~ Element pe, int foldOffset)
	234	void addFoldsElementPhp(Element pe, int foldOffset)
246	235	{
247	236
…	…
261	250	}
262	251	foreach(Element elementChild ; pe.elements) {
263		addFoldsElementPhp(~~codeview,~~ elementChild,newFoldOffset);
	252	addFoldsElementPhp(elementChild,newFoldOffset);
264	253	}
265	254	}
…	…
271	260	* This still needs more work, as typing a space causes a reparse..
272	261	*/
273		bool canAutoComplete(~~CodeView codeview~~)
	262	bool canAutoComplete()
274	263	{
275	264
…	…
297	286
298	287
299		String[] getLookupList(~~CodeView codeview,~~ inout String start)
	288	String[] getLookupList(inout String start)
300	289	{
301	290	String[] list;
…	…
330	319
331	320
332		phpElementBase = getCachedElementBase( ~~codeview ,~~ imports );
	321	phpElementBase = getCachedElementBase( imports );
333	322
334	323	//phpElementBase.dumpAll();
…	…
549	538
550	539
551		bit checkSyntax(~~CodeView codeview~~)
	540	bit checkSyntax()
552	541	{
553	542	//debug(flow ) System.writefln("CodeView.checkSintax 1");
…	…
575	564	//debug(flow ) System.writefln("CodeView.checkSintax 8");
576	565	//writefln("RETURNED: %s, %s",spawn.getOutputString(), spawn.getErrorString());
577		this.checkSyntax(~~codeview,~~spawn.getOutputString(), spawn.getErrorString());
	566	this.checkSyntax(spawn.getOutputString(), spawn.getErrorString());
578	567	//workspace.getStatusbar().addBackgroundProcess();
579	568	//debug(flow ) System.writefln("CodeView.checkSintax 9");
…	…
586	575
587	576
588		bit checkSyntax(~~CodeView codeview,~~ char[] outstr, char[] errstr)
	577	bit checkSyntax(char[] outstr, char[] errstr)
589	578	{
590	579	codeview.getWorkspace().getSystemConsole.print(outstr);
…	…
821	810	}
822	811
823		void showHelp(~~CodeView codeview,~~ String s)
	812	void showHelp(String s)
824	813	{
825	814
826	815
827		phpElementBase = getCachedElementBase( ~~codeview,getImports(codeview~~));
	816	phpElementBase = getCachedElementBase( getImports());
828	817
829	818

Download in other formats:

© Copyright 2004-2008 - The Sankaty Group, Inc. All rights reserved.

Make a Donation

Privacy Statement Terms of Service